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

841 Commits

Author SHA1 Message Date
Laurent Destailleur
29384d9a71
Merge branch 'develop' into patch-187 2019-10-09 13:02:47 +02:00
ptibogxiv
10c29887d6
Update product.class.php 2019-10-08 16:15:12 +02:00
ptibogxiv
e2d76f6f24
Update product.class.php 2019-10-08 16:13:59 +02:00
altairis
85bbf1decb Merge branch 'develop' into prodstats 2019-10-04 11:05:36 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
6858dce344 Rename table for categorie of warehouses 2019-09-27 13:28:28 +02:00
Laurent Destailleur
961f2b5165 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/takepos/invoice.php
 2019-09-24 14:25:02 +02:00
Laurent Destailleur
6431e8e16d FIX SQL injection on qty 2019-09-24 12:43:44 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
stickler-ci
1e8663b1c8 Fixing style errors. 2019-09-10 18:48:55 +00:00
ptibogxiv
651fbde64d
Merge branch 'develop' into patch-187 2019-09-10 20:46:54 +02:00
Laurent Destailleur
61cf47aa16 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-10 00:14:07 +02:00
Laurent Destailleur
a5f7211730 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/install/repair.php
 2019-09-06 16:10:55 +02:00
Laurent Destailleur
348ab4765c Fix sql injection 2019-09-06 15:20:04 +02:00
ptibogxiv
1b4788c6d0
Update product.class.php 2019-08-24 14:21:41 +02:00
ptibogxiv
0ce22d68ef
Update product.class.php 2019-08-10 09:43:26 +02:00
ptibogxiv
4f69be2c2c
Update product.class.php 2019-08-10 09:12:40 +02:00
ptibogxiv
33cf4d8417
Update product.class.php 2019-08-10 09:12:15 +02:00
ptibogxiv
3e94b3dc59
FIX count negative in stats whithcredit note 2019-08-06 16:54:44 +02:00
ptibogxiv
d22c2960b7
Update product.class.php 2019-08-06 00:14:19 +02:00
ptibogxiv
2d77bfd873
Update product.class.php 2019-08-04 14:50:25 +02:00
ptibogxiv
c9e481d6f7
Update product.class.php 2019-08-04 14:09:59 +02:00
ptibogxiv
f5f6882583
Update product.class.php 2019-08-04 13:42:50 +02:00
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
atm-josselin
c24a95b7ad Sanitize at creation of the product instead of the creation of the filepath 2019-07-01 09:31:01 +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
Christophe Battarel
face07ece1 new constant PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC 2019-05-01 15:15:20 +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