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

6895 Commits

Author SHA1 Message Date
Regis Houssin
e8dae7a8db FIX Multiccompany sharings compatibility 2022-03-24 16:40:51 +01:00
Laurent Destailleur
4a80f35aaa Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2022-03-23 17:26:25 +01:00
Laurent Destailleur
c620757dbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/langs/en_US/projects.lang
	htdocs/product/price.php
	htdocs/reception/class/reception.class.php
 2022-03-23 17:23:21 +01:00
Laurent Destailleur
32f2499c36 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/langs/en_US/projects.lang
	htdocs/langs/en_US/propal.lang
	htdocs/product/price.php
	htdocs/projet/card.php
	htdocs/reception/class/reception.class.php
 2022-03-23 17:04:31 +01:00
Laurent Destailleur
6167d8a02c
Merge pull request #20302 from marc-dll/13.0_FIX_product_price_update_error_management 
FIX: better error management at product selling price update
 2022-03-23 16:48:15 +01:00
Laurent Destailleur
18636103fc
Merge pull request #20412 from dolibit-ut/patch-383 
Update fournisseurs.php
 2022-03-23 15:53:43 +01:00
Regis Houssin
b95bb58ba0 FIX remove unused global 2022-03-22 16:49:29 +01:00
Regis Houssin
4ca3d45eca NEW add hook printFieldWhere in load_state_board function 2022-03-22 15:51:30 +01:00
UT from dolibit
1313be410a
Update fournisseurs.php 
$helpurl for DE
 2022-03-21 10:49:37 +01:00
Laurent Destailleur
8603d493ad Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/install/mysql/tables/llx_partnership.key.sql
 2022-03-19 17:34:26 +01:00
Laurent Destailleur
ed631b2b06 Fix doxygen, missing error message 2022-03-18 16:14:20 +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
a06b51e06c
Merge pull request #20385 from hregis/fix_missing_object_for_known_current_element 
FIX missing to known the current object element
 2022-03-17 13:29:22 +01:00
Laurent Destailleur
43e7547611 Fix sql errors 2022-03-17 11:49:14 +01:00
Regis Houssin
7a3b051ca0 FIX missing object element and action 2022-03-17 09:51:44 +01:00
Regis Houssin
f6c9791f2f FIX missing to known the current object element 2022-03-17 09:18:08 +01:00
Laurent Destailleur
813e1a23eb Var not defined 2022-03-17 02:13:08 +01:00
Laurent Destailleur
079fcacf13 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/products.lang
 2022-03-17 00:16:14 +01:00
Laurent Destailleur
caf999aa1f Fix scanner in inventory. Fix button must not be clicable if disabled. 2022-03-17 00:12:05 +01:00
Regis Houssin
cdc3f43a01 NEW add printFieldListWhere hook in product reassort card 2022-03-16 19:09:16 +01:00
Laurent Destailleur
4b3b9ed66b Look and feel v15 2022-03-14 11:43:58 +01:00
Laurent Destailleur
6ffa4fa7ce Fix setup when js disabled. 2022-03-14 11:19:08 +01:00
Laurent Destailleur
32a68995d6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/class/product.class.php
 2022-03-10 14:08:19 +01:00
Laurent Destailleur
cc57d3dbc1 Fix phpcs 2022-03-09 22:25:29 +01:00
Marc de Lima Lucio
e989371651 FIX: better error management at product selling price update 2022-03-08 14:49:26 +01:00
Quentin VIAL-GOUTEYRON
b904ea73a6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_inventory_pmp_hidden_conf 2022-03-08 08:55:21 +01:00
Laurent Destailleur
84b951c2f9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-07 15:27:07 +01:00
Laurent Destailleur
54ecf1f98c # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-03-07 15:24:08 +01:00
Laurent Destailleur
c4a20685a4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-07 15:21:38 +01:00
Laurent Destailleur
c0088191f1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/product/admin/product.php
	htdocs/product/class/product.class.php
 2022-03-07 15:19:51 +01:00
Laurent Destailleur
d13ae9f721 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
	htdocs/product/admin/product.php
	htdocs/product/class/product.class.php
 2022-03-07 15:13:25 +01:00
Laurent Destailleur
df0b20aad3
Merge pull request #20241 from noec764/12.0_Product_Fournisseur_Migration 
Correction of the modification on the fly of the table llx_product_fournisseur_price
 2022-03-07 15:01:40 +01:00
Laurent Destailleur
e085c3989a
Update product.php 2022-03-07 14:59:55 +01:00
Laurent Destailleur
eff4a894c2
Merge pull request #20242 from JohnXLivingston/fix_status_batch_doc 
Fix: update status_batch documentation
 2022-03-07 14:55:34 +01:00
Laurent Destailleur
e13038dc30
Update product.class.php 2022-03-07 14:06:54 +01:00
Quentin VIAL-GOUTEYRON
cc591b3a03 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_inventory_pmp_hidden_conf 2022-03-07 10:12:17 +01:00
Eric Seigne
744b84cb09 fix #20270 : use product_id in sql only if product_id is defined 2022-03-04 15:20:50 +01:00
Laurent Destailleur
358f21f06e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/customreports.php
 2022-03-01 16:48:29 +01:00
John Livingston
29eec8444e
Fix: update status_batch documentation 
$product->status_batch has a new possible value that was not documented.
 2022-03-01 16:41:07 +01:00
Laurent Destailleur
2a48dd349e Fix #hunterb03d4415-d4f9-48c8-9ae2-d3aa248027b5 2022-03-01 16:38:06 +01:00
stickler-ci
5c3b0847c2 Fixing style errors. 2022-03-01 15:20:28 +00:00
noec764
f1af7ca2f2
Update product.php 2022-03-01 16:17:32 +01:00
Noé Courtier
035bc32323 Correction of the modification on the fly of the table llx_product_fournisseur_price by an addition in the script creation of the table as well as in the script of version upgrade from 12 ->13 2022-03-01 16:14:31 +01:00
Laurent Destailleur
a08bbd6acd Fix regression 2022-03-01 00:11:30 +01:00
Laurent Destailleur
9cc79de31b Clean code 2022-03-01 00:02:23 +01:00
Frédéric FRANCE
018fc53554
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-27 08:40:01 +01:00
GregM
79a0aa816f DolGetButtonAction add $usercancreate 2022-02-25 16:42:25 +01:00
GregM
22aae26f71 update product card 2022-02-25 10:27:26 +01:00
GregM
a761afe5ed FIX add dolGetButtonAction on Product 2022-02-25 10:14:39 +01:00
GregM
c65680dbcf WIP dolGetButtonAction on Product 2022-02-24 11:48:10 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Frédéric FRANCE
b277ab9ee3
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-22 21:49:17 +01:00
Laurent Destailleur
8cc0f3bb58 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-02-22 18:47:26 +01:00
Laurent Destailleur
2c5d88d7a6
Merge pull request #20138 from defrance/patch-178 
fix : bad redirection after create
 2022-02-22 01:17:22 +01:00
BENKE Charlene
5647a04369
fix : bad redirection after create 
we have __ID__ on url redirect, so repplace it with the $id value
 2022-02-21 16:50:12 +01:00
stickler-ci
0eb8eab7f0 Fixing style errors. 2022-02-21 14:51:57 +00:00
Quentin VIAL-GOUTEYRON
76e2ee2dde uncomment line 2022-02-21 15:36:58 +01:00
atm-lena
dd6d0a118a Translation 2022-02-21 15:28:38 +01:00
atm-lena
8bbbc843eb Ajout onglet paramètres "Inventaire extrafields" 2022-02-21 15:20:22 +01:00
Quentin VIAL-GOUTEYRON
595a6c2782 new pmp column 2022-02-21 14:25:18 +01:00
Quentin VIAL-GOUTEYRON
5c2c06de3b NEW : JS inventory autocalc input 2022-02-18 15:39:56 +01:00
Quentin VIAL-GOUTEYRON
879afaa59e NEW : Beginning of PMP management on inventory 2022-02-18 12:16:50 +01:00
Laurent Destailleur
3697cb9ca4 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/reception/class/reception.class.php
 2022-02-17 11:34:54 +01:00
Laurent Destailleur
cebada1966
Merge pull request #20071 from frederic34/patch-1 
NEW Hook getNomUrl available everywhere in tooltip of ref links
 2022-02-16 20:36:02 +01:00
Laurent Destailleur
2a18bce2f3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/api/index.php
	htdocs/langs/en_US/productbatch.lang
	htdocs/langs/fr_FR/productbatch.lang
	htdocs/ticket/list.php
 2022-02-16 20:31:55 +01:00
Laurent Destailleur
645bf9564e
Merge pull request #20084 from altairis-noe/stock_doc14 
FIX: correct warehouse document location
 2022-02-16 20:18:43 +01:00
Noé Cendrier
98c50f531c translation string instead of error message text 2022-02-16 15:57:39 +01:00
Laurent Destailleur
60ada5fe72 Can filter on status purchase on list of products 2022-02-16 14:06:16 +01:00
Frédéric FRANCE
eb77f10d7b
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-15 19:11:24 +01:00
Frédéric FRANCE
a613553f37
Merge branch 'hookgetnomurl' into patch-1 2022-02-15 18:44:06 +01:00
Frédéric FRANCE
c8640f329e
add missing global 2022-02-15 18:31:05 +01:00
Laurent Destailleur
9173eec8ac Fix input lost 2022-02-14 23:02:43 +01:00
Laurent Destailleur
b98f547c4a Fix autoselect 2022-02-12 12:12:50 +01:00
Noé Cendrier
664860863e correct warehouse document location 2022-02-10 17:59:12 +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
lvessiller
2e71c21208 NEW thumbnail field in product list 2022-02-08 10:12:37 +01:00
ptibogxiv
b18b049dca
FIX api product with subproduct 2022-02-06 22:55:37 +01:00
Laurent Destailleur
1e94ffa4d2 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-04 19:07:26 +01:00
Laurent Destailleur
836ffc2b02 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-04 19:06:32 +01:00
Laurent Destailleur
63d35ecffd Fix phpcs 2022-02-04 19:05:11 +01:00
Laurent Destailleur
7cc06a0ef9 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-02-04 15:40:28 +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
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
3f87db08d4
Update product.class.php 2022-02-04 12:55:31 +01:00
El-dge
d09303d27c
Issue on stock virtuel : fix Dolibarr/dolibarr#18634 2022-02-04 12:31:40 +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
15dca77330 Fix filter on search_categ 2022-02-04 11:00:16 +01:00
Laurent Destailleur
3b8ece6c0b Fix php8 2022-01-31 21:46:35 +01:00
Regis Houssin
5f376685c3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_works_to_add_prefix_db_function 2022-01-30 11:28:29 +01:00
Laurent Destailleur
37fb02ee76 Fix #huntr76f3b405-9f5d-44b1-8434-b52b56ee395f 2022-01-29 15:50:59 +01:00
Laurent Destailleur
6a5400b1b1
Merge pull request #19919 from Easya-Solutions/new-reassort-list-stock-filter 
NEW stock filter in reassort lists
 2022-01-28 19:10:48 +01:00
Laurent Destailleur
2b39e381ad
Update api_stockmovements.class.php 2022-01-28 18:14:11 +01:00
Laurent Destailleur
adf8f3886b Merge 2022-01-28 18:07:56 +01:00
Laurent Destailleur
a113231e7b
Merge pull request #19961 from chiariello/develop 
NEW #17123 added ExtraFields for Stock Mouvement
 2022-01-28 18:04:22 +01:00
stickler-ci
807ff75b6a Fixing style errors. 2022-01-28 16:36:15 +00:00
Laurent Destailleur
a20594c2a5
Restore similar values for type than internal methods 2022-01-28 17:18:28 +01:00
Laurent Destailleur
e507fa12fa
Merge pull request #19951 from FHenry/15.0_fix_warning 
fix:silent warning php Select Lot
 2022-01-28 17:08:54 +01:00