Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,767 Commits 35 Branches 179 Tags 1.7 GiB
e3a0220658
Commit Graph

112767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
f61ca0b516
Merge branch 'develop' into NEW_stockstransfers 2022-04-14 22:50:31 +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
Laurent Destailleur
c4a96957af
Merge pull request #20613 from Hystepik/develop#1 
NEW #20609 : new massaction to assign a sale representatives on a selection of thirdparties
 2022-04-14 21:37:20 +02:00
Laurent Destailleur
0145fbebb6
Merge pull request #20626 from bb2a/formquestion-clone-order-or-propal 
FIX - add morecss select_compagny
 2022-04-14 21:05:09 +02:00
Laurent Destailleur
7636c5109d
Merge pull request #20635 from Hystepik/develop#5 
Fix : add of unique(entity,label) in llx_takepos_floor_tables table
 2022-04-14 21:04:24 +02:00
Laurent Destailleur
fa010f401a
Merge pull request #20639 from FHenry/dev_new_date_sign_in_propal_list 
NEW: Add column date Signature on propal list
 2022-04-14 21:03:43 +02:00
Laurent Destailleur
6075b627a3
Merge pull request #20633 from Easya-Solutions/fix-stockcorrection-include-tpl-path 
FIX include tpl path in product stock
 2022-04-14 21:03:15 +02:00
Laurent Destailleur
a8389fe828 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-14 20:54:43 +02:00
Laurent Destailleur
6fc650eff4 git push origin developMerge branch 'OPEN-DSI-14.0_fix_call_hook_printoriginobjectline' into develop 2022-04-14 20:53:34 +02:00
Laurent Destailleur
c7995c090f Merge branch '14.0_fix_call_hook_printoriginobjectline' of 
https://github.com/OPEN-DSI/dolibarr into
OPEN-DSI-14.0_fix_call_hook_printoriginobjectline

# Conflicts:
#	htdocs/core/class/commonobject.class.php
 2022-04-14 20:53:26 +02:00
Laurent Destailleur
9f0d0bdac5
Merge pull request #20643 from dolibit-ut/patch-392 
Update barcode_EAN13.txt
 2022-04-14 20:50:55 +02:00
Laurent Destailleur
074f96a34e
Merge pull request #20637 from atm-arnaud/FIX_inter_entity 
FIX intervention entity missing
 2022-04-14 20:50:18 +02:00
wdammak
fb2243dacd
Update card.php 2022-04-14 16:19:55 +01:00
UT from dolibit
e0d2082147
Update barcode_EAN13.txt 
start formatting & english translation
 2022-04-14 16:49:08 +02:00
Laurent Destailleur
4e34649fc2 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/index.php
 2022-04-14 16:10:23 +02:00
Laurent Destailleur
909766828e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-14 15:28:25 +02:00
Laurent Destailleur
ae412d37ed Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-14 15:28:16 +02:00
kamel
8a9be6705d FIX: Call of printOriginObjectLine hook 2022-04-14 14:14:07 +02:00
Laurent Destailleur
3d21023110 Label of option 2022-04-14 14:11:40 +02:00
Florian HENRY
f15438dd03 NEW: data sign on propal list 2022-04-14 12:28:51 +02:00
atm-arnaud
0fcfb7c5fd FIX intervention entity missing 2022-04-14 12:08:06 +02:00
lmarcouiller
c90d758b0f New : add of unique(entity,label) 2022-04-14 11:06:54 +02:00
lvessiller
5f7f9a7515 FIX include tpl path in product stock 2022-04-14 09:48:06 +02:00
wdammak
db96173189
Update card.php 2022-04-13 18:00:24 +01:00
wdammak
88a6b65353
Update card.php 
Add logo
 2022-04-13 17:11:51 +01:00
wdammak
b07096ad45
Update ajaxcompanies.php 
Add logo
 2022-04-13 17:07:23 +01:00
Laurent Destailleur
8f6831ae27
Merge pull request #20627 from Dolibarr/revert-19677-develop#1 
Revert "NEW : Import with select boxes"
 2022-04-13 16:22:03 +02:00
Laurent Destailleur
90366b1b81
Revert "NEW : Import with select boxes" 2022-04-13 16:21:25 +02:00
BB2A Anthony Berton
d154696c32 morecss select_compagny 2022-04-13 16:15:07 +02:00
Laurent Destailleur
c968b872e4
Merge pull request #20619 from fmarcet/15.0 
Fix: The resource dropdown does not show the values
 2022-04-13 12:14:56 +02:00
Laurent Destailleur
436f122f89
Merge pull request #20623 from homer8173/patch-29 
ensure priority in this usage
 2022-04-13 12:13:17 +02:00
Laurent Destailleur
29242a23c3
Update product.class.php 2022-04-13 12:11:35 +02:00
Norbert Penel
e9e10e84b2
ensure priority in this usage 
ensure priority in this usage
 2022-04-13 10:47:33 +02:00
stickler-ci
02435a616b Fixing style errors. 2022-04-13 00:19:15 +00:00
wdammak
9c8d21c63a
Create ajaxcompanies.php 2022-04-13 01:14:36 +01:00
stickler-ci
150a21820f Fixing style errors. 2022-04-13 00:14:23 +00:00
wdammak
5d9cfaa823
Update card.php 2022-04-13 01:09:44 +01:00
Laurent Destailleur
914b037a9a Fix regression: bad cache management of linked object loading. 2022-04-12 22:35:12 +02:00
Laurent Destailleur
6a7212a48d Fix sql error 2022-04-12 22:02:46 +02:00