Commit Graph

67 Commits

Author SHA1 Message Date
Laurent Destailleur
7b6755cfcd Fix several errors in search an sorting in stock by lot view 2016-08-09 13:14:33 +02:00
fappels
65ea83fa06 NEW prepare for additional warehouse statuses
Add additional warehouse statuses, so you can add extra filter
possibility. For example hide warehouses with damaged stock from
shipping. Feature is still hidden by conf ENTREPOT_EXTRA_STATUS
Still TODO: config all $formproduct->selectWarehouses
2016-04-27 16:51:51 +02:00
Laurent Destailleur
b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
2015-10-16 10:12:36 +02:00
Laurent Destailleur
8a02c8288b Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/product/index.php
2015-10-16 09:56:55 +02:00
Laurent Destailleur
9b85a70013 Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
2015-10-16 09:52:38 +02:00
Alexis Algoud
0251728e28 FIX double db escape add too quote 2015-10-12 17:36:24 +02:00
Raphaël Doursenaud
67ddb6c94e [Qual] Cleanup of inherited class properties 2015-09-24 20:12:55 +02:00
Laurent Destailleur
db1d9d6d8e Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/fourn/commande/dispatch.php
2015-09-12 11:50:46 +02:00
Laurent Destailleur
0c3ebe63c2 Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/product/class/html.formproduct.class.php
	htdocs/product/stock/index.php
	htdocs/product/stock/liste.php
	htdocs/product/stock/mouvement.php
	htdocs/product/stock/product.php
	htdocs/product/stock/valo.php
2015-09-12 11:44:07 +02:00
Maxime Kohlhaas
c6081f0fa2 Fix multientity stock management (F.Henry followup) 2015-09-11 20:38:32 +02:00
Laurent Destailleur
9b55bedf66 FIX bad calculation for stock value 2015-05-04 22:04:58 +02:00
Laurent Destailleur
c89c89c73e Mutualise code and some fixes for stock management. 2015-05-04 22:02:54 +02:00
aspangaro
d69f066735 QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
Laurent Destailleur
179cbbd187 Maxi debug and enhancement of module batch. 2015-02-11 22:54:06 +01:00
frederic34
e18577aa62 Tooltip and lib for file cache 2015-01-24 21:46:05 +01:00
frederic34
f4161b457b Add dol_escape_htmltag and start to adapt boxes 2015-01-22 00:23:55 +01:00
frederic34
1b0dd671b3 Add tooltip in getNomUrl link 2015-01-20 21:40:33 +01:00
frederic34
60661ae948 Add some "classfortooltip" 2015-01-09 00:07:54 +01:00
aspangaro
1592968709 Merge remote-tracking branch 'Upstream/develop' into develop 2014-09-20 06:42:31 +02:00
Laurent Destailleur
ad8b92541d Fix: sql request with pgsql
Fix: bug reported by scrutinizer
Doxygen
Start to work on multi user assigned to an event.
2014-09-20 00:57:29 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
Marcos García de La Fuente
7e1cf124b8 Merge branch 'develop' into syslog
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/lib/replenishment.lib.php
	htdocs/societe/soc.php
2014-07-02 21:20:02 +02:00
BENKE Charles
7d76458488 Update entrepot.class.php 2014-06-21 11:39:21 +02:00
BENKE Charles
51a2c2f5cb Update entrepot.class.php
bad element name
2014-06-21 10:43:47 +02:00
Marcos García de La Fuente
56abf1cd72 Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Maxime Kohlhaas
233a8fa917 Add new PHPUnit test on Entrepot 2014-03-16 11:38:39 +01:00
Laurent Destailleur
3fb890e9b7 New: Add total of unique different product into warehouse 2013-10-02 12:49:28 +02:00
Grand Philippe
44dee53350 english language standardization 2013-02-25 18:21:12 +01:00
Grand Philippe
b081589129 english language standardization 2013-02-25 09:52:24 +01:00
Grand Philippe
6decab1847 english language standardization 2013-02-25 09:17:38 +01:00
Grand Philippe
86de772b31 english language standardization 2013-02-24 17:08:52 +01:00
Grand Philippe
88458ca466 english standardization 2013-02-23 10:18:05 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Regis Houssin
8908f977b8 Fix: converting line delimiters !!! 2012-11-14 11:31:08 +01:00
simnandez
353c932e11 Fix: if no results do not charge data 2012-11-06 12:33:35 +01:00
simnandez
7aec227694 New: More import options. Products stocks 2012-10-26 17:52:53 +02:00
Regis Houssin
d705995a49 Fix: convert line delimiters 2012-10-18 10:36:53 +02:00
Laurent Destailleur
a41186b4c5 [ bug #70 ] Champ Stock toujours vide dans export produit 2012-10-17 20:30:17 +02:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Regis Houssin
c69fa495fa Fix: compatibility with multicompany 2012-07-02 15:42:35 +02:00
Laurent Destailleur
aea97075f1 Fix: Fix some bugs (phpunit is now ok with pgsql too) 2012-03-11 21:45:17 +01:00
Laurent Destailleur
9270e4603b Fix: Bad filters on stock movement list 2012-02-26 13:32:16 +01:00
Laurent Destailleur
bacf2003f1 Checkstyle 2012-01-22 21:17:02 +01:00
Laurent Destailleur
c2348ef600 Uniformize field country_id, country_code, country 2011-12-29 18:07:41 +01:00
simnandez
c9ea8a1867 Qual: Uniformize code 2011-12-22 16:36:01 +01:00
Laurent Destailleur
aa2a45db87 New: Add a tab info for social contributions 2011-12-21 21:14:10 +01:00