Commit Graph

108396 Commits

Author SHA1 Message Date
melina
db3edba578 Delete comments 2022-04-20 14:51:55 +02:00
melina
6788cd179c Add hooks completeAjaxReturnArray 2022-04-20 12:01:17 +02:00
altairis-melina
ea2e1c0ff2
Merge branch 'develop' into productinstock 2022-04-20 09:59:10 +02:00
melina
0faec59f56 FIX conflict and integrate Lionel fix 2022-04-20 08:13:01 +02:00
Laurent Destailleur
ad7fcd264b FIX Tabulation must be allowed for HTML content 2022-04-19 23:39:09 +02:00
Laurent Destailleur
307476786c Fix label of remain to pay on vendor invoices
FIX tool to fix bank account not in main currency for vendor invoice
2022-04-19 23:24:08 +02:00
Alexandre SPANGARO
1e96cd636f FIX Accountancy - Missing language key 2022-04-19 22:38:42 +02:00
Laurent Destailleur
aa86b2c71f Fix root passfield not editable on install
Fix user photo when gravatar not reachable
2022-04-19 22:26:27 +02:00
lvessiller
68cfe61fb8 FIX get TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCE const in TakePos 2022-04-19 17:59:59 +02:00
Lenin Rivas
8caa45ee80
Show only code multicurrency in lists 2022-04-18 12:22:29 -05:00
Alexandre SPANGARO
9a59362da2 Fix proper links for the Quick add feature 2022-04-18 07:18:02 +02:00
Laurent Destailleur
25fbd3b385 Fix missing field 2022-04-16 13:28:38 +02:00
Laurent Destailleur
140f983ca7 Fix look and feel v16 for the Quick add feature. 2022-04-15 18:04:58 +02:00
Frédéric FRANCE
34409144b3
Update agenda.lang 2022-04-15 16:24:54 +02:00
Frédéric FRANCE
dea1465fc7
add context 2022-04-15 14:44:19 +02:00
Laurent Destailleur
8c808ea5f5 Label 2022-04-15 14:31:00 +02:00
Laurent Destailleur
0960320cf8 Fix missing icon in mass action 2022-04-15 14:27:53 +02:00
stickler-ci
8f397a3809 Fixing style errors. 2022-04-15 12:25:22 +00:00
Laurent Destailleur
8bc4e9082c
Merge pull request #20647 from FHenry/15.0_fix_html_PRODUCT_LOT_ENABLE_QUALITY_CONTROL
fix: HTML on PRODUCT_LOT_ENABLE_QUALITY_CONTROL
2022-04-15 13:22:31 +02:00
Gauthier PC portable 024
2aee60ad59 NEW : expense report payments list 2022-04-15 12:14:41 +02:00
Laurent Destailleur
d445fdd172 Doc 2022-04-15 10:49:11 +02:00
Laurent Destailleur
e0b766588a Remove a step no more done 2022-04-15 10:44:37 +02:00
Florian HENRY
b4fb6cf527 fix: HTML on PRODUCT_LOT_ENABLE_QUALITY_CONTROL 2022-04-15 09:13:41 +02:00
Laurent Destailleur
a4b16c5b38 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-14 23:38:42 +02:00
Laurent Destailleur
4bf918065b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-14 23:29:00 +02:00
Laurent Destailleur
4d1eed7dc1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/perweek.php
2022-04-14 23:28:26 +02:00
Laurent Destailleur
6bbf4ccaaf Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-04-14 23:25:04 +02:00
Laurent Destailleur
fb0a38d248 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-04-14 23:24:09 +02:00
Laurent Destailleur
694357d48e
Merge pull request #19420 from marc-dll/12.0_FIX_project_activity_default_workingdays
FIX: project timesheets: assume Saturday and Sunday as default weekend days when working days conf is empty or badly formed
2022-04-14 23:23:12 +02:00
Laurent Destailleur
110fa251e8
Merge pull request #19425 from marc-dll/13.0_FIX_project_timesheet_offdays_offset
FIX: project timesheet: public holidays offset by 1 day
2022-04-14 23:22:05 +02:00
Laurent Destailleur
3e5f84b6cd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-14 23:15:05 +02:00
Laurent Destailleur
2113a944ce Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-14 23:14:56 +02:00
Laurent Destailleur
0c82ce1b69 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-14 23:04:36 +02:00
Laurent Destailleur
b5bf660fc7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-04-14 23:03:43 +02:00
Laurent Destailleur
031669493d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-04-14 23:03:35 +02:00
Laurent Destailleur
4feb2c3b83 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-04-14 23:02:16 +02:00
Laurent Destailleur
27ef6840d5 # WARNING: head commit changed in the meantime
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2022-04-14 23:01:49 +02:00
Laurent Destailleur
c4f80b4e71
Merge pull request #19424 from marc-dll/12.0_FIX_employee_tab_holiday_length
FIX: user employee tab: offset in open days messes up holiday length calculation
2022-04-14 22:59:20 +02:00
Laurent Destailleur
252888fc11
Merge pull request #20483 from hregis/fix_avoid_cookie_warning_missing_samesite
FIX avoid warning for missing cookie samesite params (and more secure)
2022-04-14 22:48:44 +02:00
Laurent Destailleur
75d3b3527c
Update main.inc.php 2022-04-14 22:45:56 +02:00
Laurent Destailleur
06f112d3ce
Update main.inc.php 2022-04-14 22:43:43 +02:00
Laurent Destailleur
1fd004d2a7
Merge pull request #20135 from atm-quentin/NEW_inventory_pmp_hidden_conf
New hidden conf to manage pmp on inventory
2022-04-14 22:42:35 +02:00
Laurent Destailleur
1438da022d
Merge pull request #20157 from atm-GregM/updateButtonsGregM
FIX: replace button with dolGetButtonAction on Societe card
2022-04-14 22:37:59 +02:00
Laurent Destailleur
aee0c8afc6
Merge pull request #20612 from vold-lu/add_tabs_in_module_builder
NEW: ModuileBuilder - Add tabs view in module builder
2022-04-14 22:17:51 +02:00
Laurent Destailleur
044ebb0c86
Merge pull request #20645 from grandoc/new_branch_14_04_2022
add code to get documents list by knowledgemanagement with api
2022-04-14 22:16:28 +02:00
Laurent Destailleur
0023850c9a
Update api_documents.class.php 2022-04-14 22:16:17 +02:00
Laurent Destailleur
e0f8f5d035
Merge pull request #20608 from fmarcet/13.0
Fix: Direct download don't work with multicompany
2022-04-14 22:15:16 +02:00
Philippe GRAND
d62d24a337 add code to get documents list by knowledgemanagement with api 2022-04-14 21:47:35 +02:00
Laurent Destailleur
ada8585921
Merge pull request #20611 from atm-kevin/FIX_Salaries_Payment_Entity
FIX : Add missing entity on salary's payment
2022-04-14 21:46:10 +02:00
Laurent Destailleur
02a3cfbb5f
Update paymentsalary.class.php 2022-04-14 21:43:55 +02:00