Commit Graph

112767 Commits

Author SHA1 Message Date
Laurent Destailleur
2b65ba4a45 FIX insert free price using price without tax on order 2022-02-10 15:03:41 +01:00
Quentin VIAL-GOUTEYRON
cd955930b6 change bt link 2022-02-10 15:00:55 +01:00
Laurent Destailleur
e0377d788c Send position x,y of cursor into an ACE editors on POST form 2022-02-10 14:34:04 +01:00
Laurent Destailleur
535c04e86e Fix region of LIVORNO 2022-02-10 14:18:13 +01:00
Laurent Destailleur
b69beb98b8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-10 13:30:22 +01:00
Laurent Destailleur
024f12aa9b Fix php5.6 2022-02-10 13:18:21 +01:00
Laurent Destailleur
c4c15fc105 Fix warnings 2022-02-10 13:16:51 +01:00
Laurent Destailleur
d2af490b33 Fix missing key on a new table 2022-02-10 13:12:00 +01:00
Laurent Destailleur
ff3fbd1cf8 Fix preselected field 2022-02-10 13:06:51 +01:00
Laurent Destailleur
21f0264683 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-10 13:02:48 +01:00
Laurent Destailleur
1d6a7ebe03 Fix pb with bulk payment feature 2022-02-10 13:01:47 +01:00
Laurent Destailleur
954938cd75 Fix buttons 2022-02-10 12:33:28 +01:00
Laurent Destailleur
f787512592 Fix buttons 2022-02-10 12:30:29 +01:00
Laurent Destailleur
760b8caa31 Fix migration 2022-02-10 11:26:36 +01:00
Laurent Destailleur
d69f9eca40 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/pdf.lib.php
2022-02-10 11:25:15 +01:00
Laurent Destailleur
a295725368 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-10 11:23:45 +01:00
Laurent Destailleur
8db6152a4d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-10 11:23:00 +01:00
Laurent Destailleur
6c8fafddf6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
2022-02-10 11:22:31 +01:00
Laurent Destailleur
7a1c4172a6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
2022-02-10 11:20:09 +01:00
Laurent Destailleur
a40f76c1d8 Merge 2022-02-10 11:15:59 +01:00
Laurent Destailleur
40f0aa45c8 Merge 2022-02-10 11:15:45 +01:00
Laurent Destailleur
9412bcdba0
Merge pull request #20009 from OPEN-DSI/new_variants_remake_sql2
NEW: Update variants to standard card and list (SQL)
2022-02-10 11:03:32 +01:00
Laurent Destailleur
d0f3274570
Merge pull request #19979 from ATM-Consulting/FIX_14.0_error_converttoreduc_with_multicurrency
fix bad array index for multicurrency
2022-02-10 10:56:42 +01:00
Quentin VIAL-GOUTEYRON
dd0202de47 fix comment doc 2022-02-10 10:46:04 +01:00
Laurent Destailleur
a257d0b3e6
Merge pull request #20035 from hregis/fix_wrong_div_name
FIX broken feature, wrong div name again
2022-02-10 10:26:49 +01:00
Laurent Destailleur
7cd9c6b7ba
Merge pull request #20003 from ptibogxiv/patch-2
FIX api product with subproduct
2022-02-10 10:25:40 +01:00
Laurent Destailleur
e901949531 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-10 10:23:52 +01:00
Laurent Destailleur
06fe8c391e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/core/lib/pdf.lib.php
	htdocs/install/mysql/tables/llx_propaldet.sql
2022-02-10 10:23:42 +01:00
stickler-ci
7cf9448609 Fixing style errors. 2022-02-10 09:22:53 +00:00
Regis Houssin
faec54ba3b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into fix_wrong_div_name 2022-02-10 10:18:45 +01:00
Regis Houssin
3eabeb2380 FIX broken feature, wrong div name again 2022-02-10 10:18:06 +01:00
Laurent Destailleur
65b81eddf4
Merge pull request #20000 from aspangaro/14p31
FIX Propal - Missing field import_key in import propal line
2022-02-10 10:17:41 +01:00
Laurent Destailleur
f4913745d0
Merge pull request #20017 from Easya-Solutions/new-product-list-thumbnail
NEW thumbnail field in product list
2022-02-10 10:14:55 +01:00
Laurent Destailleur
5bcf2153ac
Merge pull request #20016 from FHenry/14_fix_sql_extrafields
fix: in some case index do not exists and return an error
2022-02-10 10:14:06 +01:00
Laurent Destailleur
11bef4e681
Merge branch 'develop' into 14_fix_sql_extrafields 2022-02-10 10:13:24 +01:00
Laurent Destailleur
e210952f74
Update extrafields.class.php 2022-02-10 10:11:46 +01:00
Laurent Destailleur
77f1649adf
Merge pull request #20012 from atm-adrien/NEW_rec_invoices_15.0_newPR
NEW Recurring vendor invoices
2022-02-10 10:09:47 +01:00
Quentin VIAL-GOUTEYRON
2260276bed add tooltip 2022-02-10 10:09:36 +01:00
Laurent Destailleur
6ff39da34d
Update 15.0.0-16.0.0.sql 2022-02-10 10:09:05 +01:00
Laurent Destailleur
9ec7b204c1
Merge pull request #20033 from hregis/fix_broken_feature_wrong_div_name
FIX broken feature, wrong div name
2022-02-10 09:58:26 +01:00
Laurent Destailleur
d5d34930a8
Update card.php 2022-02-10 09:58:08 +01:00
Laurent Destailleur
9a371cb076 Trans 2022-02-10 09:56:01 +01:00
Regis Houssin
8dffa020b4 FIX broken feature, wrong div name 2022-02-10 09:54:09 +01:00
Laurent Destailleur
00ce52f753
Merge pull request #20031 from Easya-Solutions/new-takepos-rule-barcode
NEW barcode rule to insert product in takepos
2022-02-10 09:34:53 +01:00
Laurent Destailleur
3c49dddc02
Merge pull request #20026 from cfoellmann/PR/fix-vat-double
fix vat double in commande PDF
2022-02-10 09:31:27 +01:00
Laurent Destailleur
db81b32a5d
Merge pull request #20028 from noec764/12.0_Fix_Double_CommandeFournisseurDet
Change of SQL request when fetching CommandeFournisseurLigne
2022-02-10 09:30:36 +01:00
Laurent Destailleur
793e43c7c6
Update fournisseur.commande.class.php 2022-02-10 09:29:11 +01:00
Regis Houssin
cc8af7b1d0
FIX not active value are not hidden (missing filter of field) (#20032)
* FIX not active value are not hidden (missing filter of field)

* FIX wrong category table and wrong object id
2022-02-10 09:19:14 +01:00
Laurent Destailleur
eda401dea0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-09 21:14:06 +01:00
Laurent Destailleur
0b63ac638e FIX API caan now be used in a preflight mode by Ajax. 2022-02-09 21:12:06 +01:00