Commit Graph

112767 Commits

Author SHA1 Message Date
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
7410d50b6b
Merge pull request #19986 from el-dge/13.0
Issue on stock virtuel : fix Dolibarr/dolibarr#18634
2022-02-04 12:56:05 +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
Anthony Berton
a85f27248e
Update pdf.php 2022-02-04 09:28:01 +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
lvessiller
241a65e2ae NEW add margin info in proposal and order list 2022-02-03 10:39:03 +01:00
Alexandre SPANGARO
6d350f9a75 FIX Accountancy - Wrong name rule on import 2022-02-03 05:53:05 +01:00
mschamp
298304e9f8
Merge branch 'Dolibarr:develop' into develop 2022-02-02 20:42:09 +01:00
Laurent Destailleur
3db0a98594 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-02 18:26:15 +01:00
Laurent Destailleur
ef62cd0b18 css 2022-02-02 18:24:30 +01:00
Laurent Destailleur
0259f094bd Fix trans 2022-02-02 18:04:11 +01:00
Laurent Destailleur
ba77700619 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-02 17:58:09 +01:00
Laurent Destailleur
73474a1cea Fix css 2022-02-02 17:57:20 +01:00
atm-lena
d6ff551702 Add column "fk_parent_line" to llx_mrp_mo 2022-02-02 15:15:22 +01:00
atm-greg
6035a374b7 fix bad array index 2022-02-02 14:44:38 +01:00
Laurent Destailleur
e813de1595 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-02 14:08:54 +01:00
Laurent Destailleur
5a89da8876 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-02 14:08:19 +01:00
Laurent Destailleur
815dd74de0 Fix missing information propagated to trigger 2022-02-02 14:07:31 +01:00
Laurent Destailleur
b55830d205 Fix missing information propagated to trigger 2022-02-02 14:03:09 +01:00
Anthony Berton
da91c5f5ef
Update commonobject.class.php 2022-02-02 12:38:22 +01:00
ksar
0d534f0c37
FIX #19974 : llx_onlinesignature.sql allready exist
FIX #19974 : llx_onlinesignature.sql allready exist
2022-02-02 10:56:32 +01:00
Quentin VIAL-GOUTEYRON
f36a513a10 fix sticler 2022-02-01 16:18:02 +01:00
Laurent Destailleur
35ac8923dd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-01 16:14:12 +01:00