Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-05 08:32:53 +01:00
Code Issues Packages Projects Releases Wiki Activity
77,508 Commits 37 Branches 191 Tags
bf2d052d624a34be524b3ec4f84fa8d66eb2fd65
Commit Graph

816 Commits

Author SHA1 Message Date
Laurent Destailleur
adfbd62f8b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-14 00:44:35 +02:00
Laurent Destailleur
694be619b2 Fix doxygen 2019-07-11 22:16:32 +02:00
Laurent Destailleur
b065cbc6f8 FIX #11446 2019-07-04 12:09:04 +02:00
Laurent Destailleur
b177787f0a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
	htdocs/product/class/product.class.php
 2019-06-29 18:28:51 +02:00
Laurent Destailleur
93b0e45246 Fix duplicate class in some cases 2019-06-29 02:27:58 +02:00
Laurent Destailleur
36e240a16d NEW Add statistics on product into contracts 2019-06-29 02:03:57 +02:00
Laurent Destailleur
3ca258c93d Remove dead code 2019-06-24 22:58:21 +02:00
Laurent Destailleur
b202c7eaa0 Fix confusion between ->childs and ->childsoncascade 2019-06-22 20:17:40 +02:00
Laurent Destailleur
1a6dc83d4c Fix: default accounting account for eec and export sales were not used. 2019-06-20 12:25:58 +02:00
ATM John BOTELLA
f714b45efb FIX scrutinizer feedback 2019-05-18 15:53:07 +02:00
Laurent Destailleur
cb08bf6021 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/class/product.class.php
 2019-04-11 16:25:33 +02:00
Laurent Destailleur
54b3acc997 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/product/class/product.class.php
 2019-04-11 16:23:56 +02:00
gauthier
9a24007c0a FIX : better test 2019-04-11 15:32:50 +02:00
gauthier
524b186959 FIX : Product accountancey sell intra code must be visible if main feature level 1 2019-04-11 15:19:40 +02:00
Laurent Destailleur
fff9b7db9d Fix doxygen 2019-04-04 18:33:12 +02:00
Laurent Destailleur
50395b7dd7 New: Input field to search product always visible with focus so you can 
use a barcode flasher at any time
 2019-03-28 18:51:04 +01:00
Frédéric FRANCE
ba749ffc8c Update product.class.php 2019-03-14 09:14:29 +01:00
Laurent Destailleur
3559d600e2 Merge pull request #10770 from atm-john/theme_badge_status 
Add badge status css part1
 2019-03-11 20:49:31 +01:00
John BOTELLA
57c6c60118 Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status 2019-03-11 14:44:35 +01:00
Frédéric FRANCE
86c1694195 update doc in product class 2019-03-09 10:36:39 +01:00
Scrutinizer Auto-Fixer
68188ffda1 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-03-09 00:02:05 +00:00
Frédéric FRANCE
e845b96f2b Update product.class.php 2019-03-07 22:40:16 +01:00
John BOTELLA
ca10b1e403 add new dolGetStatus to LibStatut in product class 2019-03-07 11:37:54 +01:00
Laurent Destailleur
a426c8e9bf Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/filefunc.inc.php
	htdocs/install/upgrade2.php
	htdocs/product/class/product.class.php
 2019-03-07 11:16:24 +01:00
Laurent Destailleur
b15e00cae7 FIX Autodetect buy price for invoices autogenerated with templates. 2019-03-06 21:39:09 +01:00
Frédéric FRANCE
27218b7087 wip 2019-02-24 23:32:09 +01:00
Frédéric FRANCE
970392adb8 Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Laurent Destailleur
648eea3a70 Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
Frédéric FRANCE
b10558bacd Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
4f9f0fd7b5 Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1 Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
7ee086b402 PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Laurent Destailleur
cc574852d2 Fix phpcs 2019-01-26 15:20:36 +01:00
Laurent Destailleur
ab262237b2 Merge pull request #10393 from fappels/10_add_product_dimensions 
NEW Show product dimensions in product list tooltip.
 2019-01-26 14:14:03 +01:00
Laurent Destailleur
a5daa25707 Move common code to get sell price into a method 2019-01-24 19:45:17 +01:00
Francis Appels
9227d9fe9b Show product dimensions in product list tooltip. 2019-01-22 12:42:02 +01:00
ldestailleur
bc00fb177a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-02 19:42:15 +01:00
JC Prieto
99e2f893fd Fix: loadBatchInfo() 2019-01-02 19:38:44 +01:00
Laurent Destailleur
5c516fdae2 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2018-12-26 19:43:01 +01:00
Laurent Destailleur
85375495e5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/class/product.class.php
	htdocs/public/notice.php
	htdocs/user/card.php
 2018-12-22 19:06:58 +01:00
Laurent Destailleur
850b939ffd FIX CVE-2018-19994 2018-12-22 17:03:50 +01:00
Laurent Destailleur
54a4a54afe Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/langs/en_US/banks.lang
 2018-12-15 20:00:31 +01:00
Laurent Destailleur
27f8096afa Merge branch 'develop' into PR_NEW_reception 2018-12-15 12:50:31 +01:00
Laurent Destailleur
88a52aa11d Merge branch 'develop' into develop_mc 2018-12-14 15:58:52 +01:00
BENKE Charlene
946d55a7bb fk_default_warehouse not defined 2018-12-12 00:41:11 +01:00
Regis Houssin
aaa9a4f47c FIX use getEntity('invoice') instead getEntity('facture') 2018-11-15 17:27:49 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00