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

438 Commits

Author SHA1 Message Date
Laurent Destailleur
013d242943 Merge FCKEDITOR_ENABLE_DETAILS and FCKEDITOR_ENABLE_PRODUCTDESC. 
The 2 options has similar effect, only one in code is required.
 2022-10-25 17:16:14 +02:00
lmarcouiller
91d0eefd92 Fix : php 8.1 warnings 2022-09-27 11:22:20 +02:00
Laurent Destailleur
2a98ff313e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-25 17:12:25 +02:00
Laurent Destailleur
f5e5de1eba Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-09-25 17:12:03 +02:00
Laurent Destailleur
86091c3fde Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-25 17:01:44 +02:00
Alexandre SPANGARO
6abca50afe Use isModEnabled 2022-09-25 15:31:29 +02:00
Laurent Destailleur
e2e91c6e67
Update fournisseurs.php 2022-09-24 18:47:35 +02:00
Jean
a919618bf4 FIX #22382 Error on length of supplier reference 2022-09-24 09:47:56 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
Laurent Destailleur
362288fd02
Merge pull request #21992 from thomas-Ngr/develop_product_supplier_price_auto_fill_vat_rate 
NEW : Product supplier price: autofill default supplier VAT
 2022-09-04 12:39:41 +02:00
Philippe GRAND
371f5ee581 Update code 2022-09-03 11:30:24 +02:00
Laurent Destailleur
a5c18ea776 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-31 17:57:14 +02:00
Thomas Negre
425405a9b2 Product supplier price: autofill default supplier VAT 2022-08-30 17:10:18 +02:00
Alexandre SPANGARO
7db656a9ba PHP8 Warnings 2022-08-30 17:01:31 +02:00
Laurent Destailleur
2e905b127a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/accountancy/index.php
	htdocs/product/admin/product.php
 2022-08-25 14:35:08 +02:00
Frédéric France
582f6b196e use isModEnabled 2022-08-23 20:02:37 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Laurent Destailleur
06be8dc4bf Trans 2022-08-23 13:39:06 +02:00
Frédéric FRANCE
7f60a34799 use isModEnabled 2022-08-19 18:07:21 +02:00
This Charlène
63d821d06f
php V8 warning 2022-08-13 15:56:33 +02:00
Laurent Destailleur
ec042b1701 css 2022-08-10 14:32:26 +02:00
Laurent Destailleur
abcdb8dd10 css 2022-08-10 05:06:58 +02:00
Laurent Destailleur
5627d7ff9d Fix token 2022-06-23 12:45:28 +02:00
Laurent Destailleur
b2603c9b53 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/fournisseurs.php
 2022-06-23 12:26:26 +02:00
Laurent Destailleur
c0240ae996 Merge 2022-06-23 12:24:34 +02:00
Frédéric France
287f868fbb use getDolGlobalString 2022-06-22 08:36:24 +02:00
atm-lena
a94e39f0f4 Merge branch '14.0' of https://github.com/Dolibarr/dolibarr into 14.0_FIX_productfournprice_saveextrafieldsvalues 2022-06-21 16:38:09 +02:00
atm-lena
d99adae850 Product Fourn Price : fix error save extrafields values 2022-06-21 16:34:23 +02:00
Laurent Destailleur
bc11cf62f8 FIX #hunterdev2acfc8fe-247c-4f88-aeaa-042b6b8690a0 2022-06-13 10:44:20 +02:00
Laurent Destailleur
3bb8e9cdda Debug v16 2022-06-09 12:07:35 +02:00
lmarcouiller
207ebc9266 fix php 8.0 warnings 2022-05-11 15:06:11 +02:00
UT from dolibit
1313be410a
Update fournisseurs.php 
$helpurl for DE
 2022-03-21 10:49:37 +01:00
Laurent Destailleur
167df9593b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/langs/en_US/products.lang
	htdocs/reception/class/reception.class.php
 2022-03-17 19:08:51 +01:00
Laurent Destailleur
e46ee982ec FIX Option to manage packaging. FIX size/length/volume of reception 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/products.lang
	htdocs/reception/card.php
	htdocs/reception/class/reception.class.php
 2022-03-17 19:00:19 +01:00
Laurent Destailleur
5d415b183e FIX Option to manage packaging. FIX size/length/volume of reception 2022-03-17 18:53:50 +01:00
Laurent Destailleur
4b3b9ed66b Look and feel v15 2022-03-14 11:43:58 +01:00
Laurent Destailleur
9173eec8ac Fix input lost 2022-02-14 23:02:43 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
12044fa67a Debug v15 2022-01-10 03:24:01 +01:00
Laurent Destailleur
186185267e Clean code for v15 2021-11-29 00:49:18 +01:00
Florian HENRY
1f1e01aa88 fix php 8 warning 2021-10-22 23:38:35 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Laurent Destailleur
3d4bb66853 Clean code 2021-09-30 15:59:47 +02:00
Laurent Destailleur
d38c3028eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
 2021-09-23 02:41:53 +02:00
Laurent Destailleur
76ee014b52 Fix add a hidden solution to fix a corrupted value for AWP. 2021-09-21 16:32:32 +02:00
Laurent Destailleur
8909702619 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/bom/class/bom.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/product/class/productfournisseurprice.class.php
 2021-09-16 13:40:05 +02:00
Laurent Destailleur
5b07be0179 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/holiday/list.php
 2021-09-16 13:33:49 +02:00
Laurent Destailleur
c68687bdf6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/fournisseurs.php
 2021-09-16 13:29:25 +02:00
Laurent Destailleur
87bb971d75 FIX autocalculation of the supplier price in main currency. 
Conflicts:
	htdocs/product/fournisseurs.php
 2021-09-16 13:22:22 +02:00
Laurent Destailleur
f26601e836 FIX autocalculation of the supplier price in main currency. 2021-09-16 13:17:00 +02:00