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

1262 Commits

Author SHA1 Message Date
Laurent Destailleur
474860d546 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-03 14:06:35 +02:00
Laurent Destailleur
7b84518e59 Fix webp support 2020-06-03 14:05:18 +02:00
Laurent Destailleur
f92426034f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/website/index.php
 2020-06-03 01:06:27 +02:00
Laurent Destailleur
3b4fe0d582 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/product/class/html.formproduct.class.php
 2020-06-02 13:31:22 +02:00
Laurent Destailleur
009780b895
Update html.formproduct.class.php 2020-06-02 12:13:55 +02:00
Laurent Destailleur
88a831c05a
Update html.formproduct.class.php 2020-06-02 12:12:07 +02:00
atm-lena
99b4bfc91e Movement of hook "selectwarehouse" 2020-06-02 09:53:30 +02:00
Anthony Berton
c0b6fd1811
Update html.formproduct.class.php 2020-05-27 22:35:55 +02:00
Anthony Berton
9efcc631d7
Merge branch 'develop' into Add-option-in-stock-for-affect-warehouse- 2020-05-27 14:47:20 +02:00
Frédéric FRANCE
174ddc5fd4
prepare new rule 2020-05-23 21:07:47 +02:00
Frédéric FRANCE
0f4f727d18
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-22 08:27:12 +02:00
Laurent Destailleur
5d78f6dac5 NEW Add link to edit property from search result of website pages 2020-05-22 00:38:01 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
a25ed0e041
add new rule 2020-05-21 01:56:06 +02:00
atm-lena
e042807b32 Add $this to parameters 2020-05-19 15:58:16 +02:00
atm-lena
3f28c9a461 Add parameters to hook 2020-05-19 15:31:37 +02:00
atm-lena
987fb806c6 Exclude array param 2020-05-19 15:24:53 +02:00
atm-lena
f518bafda9 11.0 - Add Hook "SelectWarehouses" 2020-05-19 15:17:06 +02:00
Langlais115
dc6ae70aa6 Fix #13805 
Add proper type check to "seuil_stock_alerte" parameter.
 2020-05-15 14:00:26 +02:00
Laurent Destailleur
f6ac2d2545
Merge pull request #13866 from Tim-Otte/fix-11948 
FIX #11948
 2020-05-12 03:07:53 +02:00
Laurent Destailleur
a099858385
Update product.class.php 2020-05-12 03:07:23 +02:00
Tim Otte
65011c2877 Fixed the product unit translation 2020-05-11 15:11:23 +02:00
Anthony Berton
eb411d16ab Update html.formproduct.class.php 2020-05-06 00:58:51 +02:00
Anthony Berton
c6d2a1faf3 Add options 
Add options in module stock
 2020-05-06 00:48:00 +02:00
Laurent Destailleur
535ae612f3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-03 22:48:48 +02:00
Laurent Destailleur
4d6a45d491 Major doxygen fix 2020-05-03 22:48:35 +02:00
Laurent Destailleur
33669b6fd8
Update html.formproduct.class.php 2020-05-03 21:15:23 +02:00
stickler-ci
080db7629f Fixing style errors. 2020-05-03 15:21:00 +00:00
Anthony Berton
f42492764d Update html.formproduct.class.php 
DEFAULT_WAREHOUSE is not select in sherch
 2020-05-03 17:16:25 +02:00
Laurent Destailleur
90bbb9beac Fix API to delete purchase price 2020-05-02 03:33:33 +02:00
Laurent Destailleur
4606b9fd9f Fix name of class Service (already used by APIs) 2020-05-02 03:29:33 +02:00
Laurent Destailleur
ed045b2673 FIX #13749 2020-04-27 15:04:31 +02:00
Laurent Destailleur
a1142f884d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-27 15:03:34 +02:00
Laurent Destailleur
50d9f466d4 FIX #13749 2020-04-27 14:38:45 +02:00
Laurent Destailleur
1c70e49695
Merge branch 'develop' into 12.0_a23 2020-04-27 14:14:13 +02:00
Scrutinizer Auto-Fixer
1bf5745286 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-25 11:52:07 +00:00
Laurent Destailleur
3ed11f374a Look and feel v12 2020-04-24 23:56:57 +02:00
Scrutinizer Auto-Fixer
548f3007cf Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-23 16:55:10 +00:00
Laurent Destailleur
72c6ac1c72 Complete #13708, normalization of code 2020-04-23 13:21:39 +02:00
Laurent Destailleur
f816fae86c Fix a duplicated index 2020-04-20 12:21:13 +02:00
Laurent Destailleur
d176840bfb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-16 16:02:28 +02:00
Laurent Destailleur
3c29a7b8d8 Fix phpcs 2020-04-16 16:02:06 +02:00
Laurent Destailleur
5254a94038 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ldap.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/index.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/expedition/list.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/list.php
	htdocs/loan/list.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/list.php
 2020-04-16 15:58:59 +02:00
atm-quentin
18fdf3573f FIX draftordered replenish virtual stock 2020-04-15 16:05:50 +02:00
Laurent Destailleur
dc86f9528d Fix MRP module 2020-04-13 18:10:20 +02:00
Laurent Destailleur
3740d59848 Look and feel v12 2020-04-13 04:14:28 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
84cda962c1 Clean dead code 2020-04-02 12:03:29 +02:00
Laurent Destailleur
401265d09e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-30 19:56:59 +02:00
Laurent Destailleur
3860f24908 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/product/class/product.class.php
 2020-03-30 19:56:31 +02:00