Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-22 12:54:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
108,518 Commits 39 Branches 191 Tags
0fd2e91ccc127f2a0791e2e9eb57504acba0d025
Commit Graph

96128 Commits

Author SHA1 Message Date
Laurent Destailleur
faa226d875 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-04 20:34:26 +01:00
Laurent Destailleur
c53bac831d Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-04 20:33:32 +01:00
Laurent Destailleur
ba795310b5 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-04 20:32:39 +01:00
Laurent Destailleur
7ade138590 Fix phpcs 2022-02-04 20:30:45 +01:00
Laurent Destailleur
86da9c610e Merge pull request #17887 from marc-dll/develop_NEW_block_leave_if_negative_balance 
NEW: leave requests: add field into type dictionary to block request if balance is negative
 2022-02-04 20:23:04 +01:00
Laurent Destailleur
4e7ad489b2 Merge pull request #19995 from bb2a/patch-2 
FIX - Hide ref subpruct
 2022-02-04 20:14:52 +01:00
Laurent Destailleur
20ddd04d14 Make around 15 tables not created by default but at first module init. 2022-02-04 20:06:09 +01:00
Laurent Destailleur
c9a685e09d Better error message 2022-02-04 19:21:47 +01:00
Laurent Destailleur
1e94ffa4d2 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-04 19:07:26 +01:00
Laurent Destailleur
836ffc2b02 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-04 19:06:32 +01:00
Anthony Berton
07c7209c0c Update pdf.lib.php 2022-02-04 19:05:22 +01:00
Laurent Destailleur
63d35ecffd Fix phpcs 2022-02-04 19:05:11 +01:00
BENKE Charlene
8d74b51009 fix : duration in hour and min (not in second) 
use convertSecondToTime for totalise duration
 2022-02-04 15:52:37 +01:00
Laurent Destailleur
7cc06a0ef9 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-02-04 15:40:28 +01:00
BENKE Charlene
5f3c81daee FIX if we have PRODUCT_USE_UNITS, task fail 
we need 	public function getLabelOfUnit($type = 'long') fonction or printlineOriginLine fail
 2022-02-04 15:35:03 +01:00
Laurent Destailleur
e85051aaaa Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-04 15:32:50 +01:00
Laurent Destailleur
3884c7b25f Merge pull request #19894 from defrance/patch-176 
FIX if we have PRODUCT_USE_UNITS, task fail
 2022-02-04 15:32:24 +01:00
Gauthier PC portable 024
accf426f19 FIX : extrafields are not used yet + fix ihm 2022-02-04 15:14:30 +01:00
Laurent Destailleur
5249840402 FIX #yogosha8628 2022-02-04 15:14:10 +01:00
iouston
993e0d852c fix parameter name 2022-02-04 15:01:32 +01:00
stickler-ci
7e6279e942 Fixing style errors. 2022-02-04 13:48:25 +00:00
iouston
0cc8e6873f add attribute target on getNomurl() 2022-02-04 14:44:47 +01:00
stickler-ci
e8801bd7fc Fixing style errors. 2022-02-04 13:42:07 +00:00
iouston
95aabd6ae3 add target attribute on getNomUrl 2022-02-04 14:38:34 +01:00
Laurent Destailleur
f99e19e729 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-04 13:19:55 +01:00
Laurent Destailleur
85e198283b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-04 13:18:26 +01:00
Laurent Destailleur
66430f6087 FIX #19939 2022-02-04 13:18:07 +01:00
Laurent Destailleur
e57bc01466 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/product/class/product.class.php
 2022-02-04 13:02:45 +01:00
Laurent Destailleur
3f87db08d4 Update product.class.php 2022-02-04 12:55:31 +01:00
Laurent Destailleur
a81b437d04 Merge pull request #19971 from atm-quentin/NEW_exclude_natural_search 
NEW Can use ! to make a search that exclude a string
 2022-02-04 12:51:26 +01:00
Laurent Destailleur
4324558d67 FIX backup fails 2022-02-04 12:34:42 +01:00
El-dge
d09303d27c Issue on stock virtuel : fix Dolibarr/dolibarr#18634 2022-02-04 12:31:40 +01:00
Laurent Destailleur
a7021008ba Update pdf.lib.php 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2022-02-04 12:27:13 +01:00
Laurent Destailleur
eb644bf6bb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-04 12:18:05 +01:00
Laurent Destailleur
aef646bb2a Change order of options and removed useless option 2022-02-04 12:17:38 +01:00
Laurent Destailleur
bfea5cd69d Merge pull request #19966 from habot-it/develop 
Fix "Warning: This option make TCPDF library being crazy sometime and…
 2022-02-04 12:14:26 +01:00
Laurent Destailleur
6894cb3925 Update pdf.lib.php 2022-02-04 12:14:11 +01:00
Laurent Destailleur
91b4cd43bb Merge pull request #19946 from smil2k/feature/19944-develop 
NEW add datem and type parameters to API to create movements
 2022-02-04 11:11:46 +01:00
Laurent Destailleur
5294a9ae2f Merge pull request #19949 from hregis/fix_works_to_add_prefix_db_function 
Works on replace MAIN_DB_PREFIX by $db->prefix()
 2022-02-04 11:09:51 +01:00
Laurent Destailleur
58b6512c15 Merge pull request #19963 from mschamp/develop 
NEW #19294 implement detailed timespent in task of project API
 2022-02-04 11:07:12 +01:00
Laurent Destailleur
15dca77330 Fix filter on search_categ 2022-02-04 11:00:16 +01:00
Laurent Destailleur
ef054bcef2 Merge pull request #19972 from habot-it/feat/add-parent-company 
NEW Can set the parent company during the creation of thirdparty (action=add of societe/card.php)
 2022-02-04 10:47:35 +01:00
Laurent Destailleur
95833135f4 FIX #19974 2022-02-04 10:44:19 +01:00
Laurent Destailleur
ff39bcb058 Merge pull request #19975 from ksar-ksar/patch-13 
FIX #19974 : llx_onlinesignature.sql allready exist
 2022-02-04 10:35:56 +01:00
Laurent Destailleur
035081afbb Merge pull request #19977 from atm-lena/NEW_OF_Child_Data 
Add column "fk_parent_line" to llx_mrp_mo
 2022-02-04 10:34:52 +01:00
Laurent Destailleur
3a9564ed88 Merge pull request #19976 from bb2a/patch-1 
FIX - Trigger in setPaymentMethods for order
 2022-02-04 09:23:11 +01:00
Laurent Destailleur
12f1aeb9df Merge pull request #19982 from Easya-Solutions/new-margin-proposal-order-list 
NEW add margin info in proposal and order list
 2022-02-04 09:16:45 +01:00
Laurent Destailleur
a5bdd62268 Merge pull request #19981 from aspangaro/14p30 
FIX Accountancy - Wrong name rule on FEC import
 2022-02-04 09:12:11 +01:00
Laurent Destailleur
665737285e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-03 19:25:42 +01:00
Laurent Destailleur
840e3b5bc3 Fix url 2022-02-03 19:21:59 +01:00