Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-08 10:38:15 +01:00
Code Issues Packages Projects Releases Wiki Activity
125,218 Commits 36 Branches 190 Tags
c263fccb5f8bedd828ef2fd34b64b51fb8812c06
Commit Graph

237 Commits

Author SHA1 Message Date
Frédéric FRANCE
fa849696fb use isModEnabled 2023-04-18 20:16:02 +02:00
Laurent Destailleur
9a420b8f41 Clean code 2023-04-18 16:15:27 +02:00
Gauthier PC portable 024
1b9f05c7e0 Merge branch 'NEW/develop_stock_limit_for_alert_and_desired_optimal_stock_by_product_and_warehouse_import' of github.com:atm-gauthier/dolibarr into NEW/develop_stock_limit_for_alert_and_desired_optimal_stock_by_product_and_warehouse_import 2023-04-03 14:32:36 +02:00
Gauthier PC portable 024
90e3f786ca Merge branch 'NEW/stock_limit_for_alert_and_desired_optimal_stock_by_product_and_warehouse_import' of github.com:atm-gauthier/dolibarr into NEW/develop_stock_limit_for_alert_and_desired_optimal_stock_by_product_and_warehouse_import 2023-04-03 14:30:19 +02:00
Gauthier PC portable 024
8364de054a FIX : regex array checks 2023-04-03 14:29:46 +02:00
stickler-ci
69791c8530 Fixing style errors. 2023-04-03 10:10:48 +00:00
Gauthier PC portable 024
4c557d6cb9 Merge branch 'NEW/stock_limit_for_alert_and_desired_optimal_stock_by_product_and_warehouse_import' of github.com:atm-gauthier/dolibarr into NEW/develop_stock_limit_for_alert_and_desired_optimal_stock_by_product_and_warehouse_import 2023-04-03 11:54:29 +02:00
Gauthier PC portable 024
9a05c16edc NEW : Stock limit for alert and desired optimal stock by product and warehouse import 2023-04-03 11:50:06 +02:00
Laurent Destailleur
2663c8f2f2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-03-28 23:30:26 +02:00
Laurent Destailleur
5b0b874535 NEW Add a status on supplier price ref (WIP to close a supplier ref) 2023-03-28 21:30:08 +02:00
Laurent Destailleur
b0b1e8d327 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-27 03:40:12 +01:00
Alexandre SPANGARO
c8e32bf96f FIX Activate widget Alert product on stock only on home 2023-02-25 07:29:57 +01:00
Philippe GRAND
19796c9db1 update code toward php8 compliance 2022-12-30 12:47:18 +01:00
VESSILLER
4bd57e72a5 NEW add quantity in update keys in supplier prices import 2022-11-30 15:35:01 +01:00
Laurent Destailleur
41a07f5e7d Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-29 12:51:51 +02:00
Maxime Kohlhaas
7e1a37c138 Fix : remove duplicate code and fix #22176 2022-10-23 11:35:58 +02:00
Laurent Destailleur
98ed321514 Merge branch 'develop' into 17p6 2022-09-28 20:55:43 +02:00
Frédéric France
c7ee2f413c min php version is 7.0 2022-09-27 20:48:47 +02:00
Alexandre SPANGARO
70e313f16e Use isModEnabled 2022-09-25 22:46:35 +02:00
Alexandre SPANGARO
419a307b2b Use isModEnabled 2022-09-25 06:03:47 +02:00
Philippe GRAND
1dc58f9684 update code toward php8 compliance 2022-09-24 14:44:16 +02:00
Philippe GRAND
30c58ab74d Update code 2022-09-03 11:19:18 +02:00
Laurent Destailleur
ac6a1b0549 Merge pull request #21873 from bb2a/Right-price 
NEW - Add right for read price if const MAIN_USE_ADVANCED_PERMS
 2022-08-25 12:24:35 +02:00
Anthony Berton
6f8de50004 Add right 2022-08-24 19:59:06 +02:00
Frédéric France
86a7a7c8bb use isModEnabled 2022-08-23 20:05:09 +02:00
Frédéric FRANCE
7f60a34799 use isModEnabled 2022-08-19 18:07:21 +02: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
809c8f993b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/modPropale.class.php
	htdocs/filefunc.inc.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
 2021-12-30 19:03:46 +01:00
Laurent Destailleur
62a74ed428 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
	htdocs/societe/list.php
 2021-12-30 17:57:45 +01:00
Ferran Marcet
2b7c3be511 Replace sql operator 2021-12-20 12:34:46 +01:00
Ferran Marcet
ad1d553d11 Merge branch '13.0up' into 13.0 
# Conflicts:
#	htdocs/core/modules/modAdherent.class.php
#	htdocs/core/modules/modProduct.class.php
#	htdocs/core/modules/modProjet.class.php
#	htdocs/core/modules/modResource.class.php
#	htdocs/core/modules/modService.class.php
#	htdocs/core/modules/modSociete.class.php
#	htdocs/core/modules/modUser.class.php
 2021-11-26 12:29:38 +01:00
Laurent Destailleur
d891dd8ddc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/stocks.lang
	htdocs/product/stats/card.php
	htdocs/projet/element.php
	htdocs/salaries/card.php
 2021-10-31 16:19:10 +01:00
Laurent Destailleur
da4fe03be7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/html.formticket.class.php
	htdocs/ticket/card.php
 2021-10-31 14:37:33 +01:00
Laurent Destailleur
ca8dab36a3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.formticket.class.php
	htdocs/core/modules/modAdherent.class.php
	htdocs/core/modules/modProjet.class.php
 2021-10-31 14:33:44 +01:00
Ferran Marcet
9f23528ccd Fix: Import don't work if extrafield is separator 2021-10-29 12:39:22 +02:00
Ferran Marcet
1336d3e791 Fix: Import don't work if extrafield is separator 2021-10-29 12:25:50 +02:00
Laurent Destailleur
b43fddfc74 Merge pull request #18058 from altairisfr/exportprices 
add labels and export only latest prices
 2021-07-02 16:35:58 +02:00
Christophe Battarel
ac6cb5853e fix for multientity 2021-06-30 15:35:55 +02:00
Christophe Battarel
4f2e579bb2 add labels and export only latest prices 2021-06-30 10:21:31 +02:00
Christophe Battarel
0b5e231dd5 add labels and export only latest prices 2021-06-30 10:18:14 +02:00
Alexandre SPANGARO
f95b5be971 FIX Accountancy - Clean virtual zero on the import 2021-06-30 04:55:22 +02:00
Alexandre SPANGARO
d27030df3f Merge remote-tracking branch 'upstream/develop' into 14a39 2021-04-20 04:43:14 +02:00
Alexandre SPANGARO
2f31720896 Maxi debug of societe/product per entity 2021-04-14 04:45:17 +02:00
Alexandre SPANGARO
f749111148 Work on split module fournisseur 2021-04-12 06:27:46 +02:00
Alexandre SPANGARO
ce7c5a0c7b Work on split module fournisseur 2021-04-11 04:24:21 +02:00
Alexandre SPANGARO
5723dbb836 FIX: Add a sub table to manage accountancy on product/company 2021-03-31 04:52:24 +02:00
Alexandre SPANGARO
4e30481fa2 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-30 22:05:03 +02:00
Laurent Destailleur
9ad3ba1572 Fix regression in export 2021-03-30 17:28:58 +02:00