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

110296 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Laurent Destailleur
5e76c1a45d Fix doc 2022-04-12 21:59:34 +02:00
Ferran Marcet
ed172421f0 Fix: The resource dropdown does not show the values 2022-04-12 19:20:45 +02:00
Ferran Marcet
6cbcc54bd9 Fix: The resource dropdown does not show the values 2022-04-12 19:19:41 +02:00
Laurent Destailleur
a776caf7a4
Merge pull request #20614 from atm-kevin/FIX_Missing_Entity_NEW_VAT 
FIX : Missing entity on adding new VAT
 2022-04-12 16:29:48 +02:00
Laurent Destailleur
1bfd9c695f
Update tva.class.php 2022-04-12 16:29:25 +02:00
Laurent Destailleur
04ad919a2c Debug modulebuilder for v16. 2022-04-12 15:51:46 +02:00
Laurent Destailleur
386b8bee5e Fix deletion/creation of extrafields. 2022-04-12 15:26:21 +02:00
Laurent Destailleur
599c90ae6b FIX dol_string_onlythesehtmltags can keep html comments 2022-04-12 14:57:12 +02:00
stickler-ci
adda436dab Fixing style errors. 2022-04-12 12:45:05 +00:00
kevin
c51aff99af Add missing entity on adding new VAT 2022-04-12 14:38:17 +02:00
Laurent Destailleur
b1cc271ad5 Fix trans 2022-04-12 14:23:39 +02:00
Aloïs Micard
36372b250c
Merge branch 'develop' into add_tabs_in_module_builder 2022-04-12 14:12:41 +02:00
lmarcouiller
d41676cf8b Close #20609 : new massaction asign sale representative 2022-04-12 13:57:00 +02:00
Laurent Destailleur
a006eaecde Fix trans 2022-04-12 13:02:33 +02:00
Aloïs Micard
752cc6f4a7 Lint source code 2022-04-12 11:17:24 +02:00
Aloïs Micard
a747f574b3 Improve comment 2022-04-12 11:15:40 +02:00
Aloïs Micard
25a851ac70 Fix translation 2022-04-12 11:12:43 +02:00