Commit Graph

96128 Commits

Author SHA1 Message Date
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
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
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
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
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
Laurent Destailleur
59f749a65f Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-09 18:11:09 +01:00
Laurent Destailleur
5a37b2c649 Fix API call 2022-02-09 18:10:21 +01:00
Laurent Destailleur
fe01f75e97 Fix API_ENDPOINT_RULES with api of external modules 2022-02-09 17:50:26 +01:00
lvessiller
0d68846b3a FIX add filter on categories 2022-02-09 17:44:48 +01:00
Laurent Destailleur
c7f99f140e Fix remove validator 2022-02-09 17:41:32 +01:00
Laurent Destailleur
ce1a08baf6 Fix phpcs 2022-02-09 16:59:40 +01:00
Laurent Destailleur
7e9a50a113 Fix phpcs 2022-02-09 16:58:13 +01:00
lvessiller
25497018c7 FIX group by qty in update line 2022-02-09 16:49:40 +01:00
lvessiller
44e9b13f30 NEW barcode rule to insert product in takepos 2022-02-09 16:37:41 +01:00
Quentin VIAL-GOUTEYRON
9e667e0155 NEW Needed nets bom 2022-02-09 15:55:21 +01:00
noec764
d9bac75a63 Merge branch '12.0' into 12.0_Fix_Double_CommandeFournisseurDet 2022-02-09 15:33:45 +01:00
Laurent Destailleur
558db1b935 Fix #yogosha8845 2022-02-09 15:29:21 +01:00
Laurent Destailleur
47800aebfa Fix phpunit and mode save after opening a ref 2022-02-09 15:21:25 +01:00
Laurent Destailleur
7055d326e4 FIX rtl languages 2022-02-09 13:24:11 +01:00
Laurent Destailleur
6e6c57d0e5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-09 13:22:53 +01:00
Laurent Destailleur
7c78934d08 FIX rtl languages 2022-02-09 13:22:38 +01:00