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

533 Commits

Author SHA1 Message Date
Laurent Destailleur
79be93d998 FIX The table llx_product_lot is now filled/used to store eatby/sellby 
dates.
 2016-05-17 18:19:36 +02:00
Laurent Destailleur
3b99fb01ee Fix duplicate table 2016-05-17 10:51:03 +02:00
Laurent Destailleur
95ea20eb44 Clean code for stock movement when lot are used. We should not get 
duplicate records into llx_product_batch
 2016-05-17 01:10:11 +02:00
Laurent Destailleur
20a2e9394d Fix typo comment 2016-05-16 22:44:11 +02:00
Laurent Destailleur
10c7b167ea Merge pull request #5115 from fappels/develop-new-warehouse-only-internal-status 
NEW prepare for additional warehouse statuses
 2016-05-05 21:27:47 +02:00
Laurent Destailleur
f324c662c2 Better update of database cleaning non expected records. 2016-04-30 21:58:00 +02:00
Laurent Destailleur
50323afe94 Add comment 2016-04-30 21:33:18 +02:00
Laurent Destailleur
e723966583 FIX: Qty in stock must be float like it is in stock movement. 
FIX: Can't create a stock transfer from product card
Performance enhancement of stock information loading.
 2016-04-28 11:01:56 +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
7b16482cee Add comment to show directoves to solve conception error on lot 
management (add a table to store all lots and their properties: date,
note, ...)
Removed deprecated field pmp at stock level (pmp is at product level)
 2016-04-09 10:01:22 +02:00
fappels
9fa742ceb2 [QUAL] Shipment error handling 2015-12-14 21:38:26 +01:00
Laurent Destailleur
3b595f0247 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/report.lib.php
	htdocs/langs/en_US/accountancy.lang
 2015-12-13 16:23:33 +01:00
Laurent Destailleur
12702ee128 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/report.lib.php
	htdocs/product/stock/class/mouvementstock.class.php
 2015-12-03 12:59:13 +01:00
Laurent Destailleur
7105fabb79 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/langs/en_US/users.lang
	htdocs/product/stock/class/mouvementstock.class.php
 2015-12-03 12:51:49 +01:00
Marcos García de La Fuente
9f27e2323f FIX #3734 Do not show empty links of deleted source objects in stock movement list 2015-11-21 11:51:23 +01:00
Christophe Battarel
fa088eb6cc FIX bad calculation for stock value 2015-11-05 14:57:58 +01: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
Laurent Destailleur
62792c08eb Merge pull request #3591 from GPCsolutions/inherited 
[Qual] Cleanup of inherited class properties
 2015-09-26 11:23:59 +02:00
Raphaël Doursenaud
67ddb6c94e [Qual] Cleanup of inherited class properties 2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
9f2545b95d [Qual] Replaced deprecated dol_clone by native clone 2015-09-24 17:24:40 +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
03435d7d90 Fix bad error management 2015-09-01 12:36:43 +02:00
BENKE Charlie
af7302fa90 change done 2015-08-23 00:30:11 +02:00
BENKE Charlie
1b117d5581 add in get_origin function generic origintype 
actually we have only internal module origintype 
propose to add feature to add stockmovement from other external module
 2015-08-21 14:10:55 +02:00
Laurent Destailleur
3bdd342df1 Fix #3116 2015-08-14 23:53:59 +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
Laurent Destailleur
8ebad7a395 A serious rewrite of a lot of code to have the module batch number 
stable.
 2015-04-12 17:08:14 +02:00
Laurent Destailleur
56a14da5d4 FIXME that are not bug are replaced with TODO 
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
 2015-04-12 04:01:28 +02:00
Marcos García de La Fuente
831177ef99 Implemented constants for Product class 2015-03-30 03:14:07 +02:00
Laurent Destailleur
a55af4387b Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	.travis.yml
	htdocs/core/class/notify.class.php
	htdocs/product/stock/class/mouvementstock.class.php
	test/phpunit/AllTests.php
	test/phpunit/MouvementStockTest.php
 2015-03-22 12:10:39 +01:00
Laurent Destailleur
c9b569ad1a Fix calculation of PMP of product. 
Also add phpunit test to avoid this in future.
 2015-03-21 15:31:11 +01:00
Laurent Destailleur
4f9aef6150 Fix calculation of PMP of product. 
Also add phpunit test to avoid this in future.
 2015-03-21 15:29:23 +01:00
aspangaro
d69f066735 QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
Alexis Algoud
0c53121553 - use incdec into virtual product definition. 
- improve screen of virtual product
 2015-02-23 12:19:19 +01:00
Gauthier
02d59cce5a NEW : Product stock and subproduct stock are independant 2015-02-16 16:06:50 +01:00
Laurent Destailleur
6adfc6f6f4 Work on batch module. Add batch, eatby and sellby into movement table. 
Clean language files for direct print module.
 2015-02-12 15:23:31 +01:00
Laurent Destailleur
78ba1fe86e Fix bad null management 2015-02-12 00:01:31 +01:00
Laurent Destailleur
179cbbd187 Maxi debug and enhancement of module batch. 2015-02-11 22:54:06 +01:00
Laurent Destailleur
556c27f834 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/stock/mouvement.php
 2015-02-04 15:15:50 +01:00
Laurent Destailleur
43702cf662 New: Enhance stock management: Introduce tag to define if a subproduct 
must have stock decreased and add inventory code on stock movements.
 2015-01-30 01:51:28 +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
Laurent Destailleur
e24a668c52 Merge pull request #2225 from frederic34/psr2 
Psr2
 2015-01-09 22:53:06 +01:00
frederic34
60661ae948 Add some "classfortooltip" 2015-01-09 00:07:54 +01:00
frederic34
73fda2cb86 WIP PSR2 2015-01-08 18:36:03 +01:00
Laurent Destailleur
6a70af2b67 Fixed: bug into produc batch management 2014-12-09 14:03:10 +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
Maxime Kohlhaas
6349e5e4a2 Class MouvementStock was not extending CommonObject so error on call_trigger function 2014-07-29 15:45:53 +02:00
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
KreizIT
5e7c0639b0 Refactor: various trigger 2014-07-11 16:02:27 +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
13ce63ce99 replace mvid by $mvid, wrong week-end 2014-06-22 22:59:25 +02:00
BENKE Charles
3a886dfeb4 Update mouvementstock.class.php 
return mouvement id instead simply "1", i need to store the movement id on my factory modules (to update it at the end of the build process if it's need)
 2014-06-21 17:51:50 +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
ca0a6cb307 Removed SQL string from call debug log 2014-06-13 01:34:39 +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
Maxime Kohlhaas
67342486a6 Task 1074 : add link to source document on stock movement 2014-03-15 02:18:39 +01:00
KreizIT
feae560aa3 Travis correction. 2014-03-05 11:28:40 +01:00
KreizIT
58f2bf078b -Add batch record management 
-Implements stock increase or decrease with batch number record on product's warehouse tab
 2014-03-05 10:54:07 +01:00
Laurent Destailleur
da569ea8d4 Fix: Serious pb with loading stocks. If we use product->stock_reel or 
product->stock_warehoure[], we must call product->load_stock() after the
product->fetch().
 2013-12-10 19:39:28 +01:00
Francis Appels
d7fc0eea43 fix: _create() 
add 'require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';'
to htdocs/product/stock/class/mouvementstock.class.php _create method.
This to support product class instance used in function.
 2013-10-15 11:12:41 +02:00
Laurent Destailleur
ae8f0c3efd New: Add number of product in stock before and after selected period 
when a filter is done on a period + a specific product.
 2013-10-10 17:16:15 +02:00
Laurent Destailleur
3fb890e9b7 New: Add total of unique different product into warehouse 2013-10-02 12:49:28 +02:00
Laurent Destailleur
205ff535a9 Fix: [ bug #919 ] SQL error in product/stock/product.php 2013-06-04 00:30:38 +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
Laurent Destailleur
7f2c6dc6eb Only code comments 2012-11-03 14:44:06 +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
Laurent Destailleur
4789b5e2d1 Fix: Usage of specific mysql function is forbidden 2012-10-06 22:46:54 +02:00
Maxime Kohlhaas
12128a6226 Task # 186 : Stock calculation on product, migration + update product 2012-10-04 15:25:34 +02:00
Regis Houssin
43c0a03758 Fix: strict mode tornado 2012-09-15 11:21:22 +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
Marcos García
5a73c32f46 Migrated ClassName to __construct() function 
Changed $DB to $db
lower-cased "Class"
 2012-07-30 17:17:33 +02:00
Laurent Destailleur
d07e68e12f Fix: Combo list of warehouse not saved. 
Fix: Validate of shipment in error
when using not predefined products.
 2012-07-17 01:22:19 +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
Regis Houssin
5f02432d90 Fix: add possibility to force date of stock movement 2011-12-18 20:59:05 +01:00
Laurent Destailleur
b52fc32853 Fix: fix not initialized variables 2011-12-05 19:41:38 +01:00
Laurent Destailleur
12963265d7 Add confirm message when going back to draft 2011-11-14 16:23:59 +01:00
Laurent Destailleur
ca335e4fe0 New: Support zip/town autocompletion on warehouses 2011-11-14 11:28:16 +01:00
Laurent Destailleur
be6286c4b8 Qual: More POO. 
Qual: Doxygen
 2011-09-20 17:19:46 +00:00
Regis Houssin
551e1f81bf Fix: Space after closing parenthesis of function call prohibited 2011-09-20 13:32:16 +00:00
Laurent Destailleur
d9408d1847 Doxygen 2011-09-12 18:15:11 +00:00
Laurent Destailleur
b75d19c264 Qual: Uniformize constructors 2011-09-11 18:35:38 +00:00
Regis Houssin
27300fe898 Fix: remove obsolete tags (in progress) 2011-08-27 16:15:06 +00:00
Regis Houssin
726d9581dd Fix: remove obsolete tags (in progress) 2011-08-27 14:24:16 +00:00
Laurent Destailleur
37ead2f97e Fix: Avoid errors into rpm packages 2011-07-31 23:19:04 +00:00
Laurent Destailleur
bc25b7bd2c Qual: Removed deprecated feature 2011-06-08 12:48:05 +00:00
Laurent Destailleur
edd91b7d26 Qual: Clean stock increase/decrease code 2011-05-23 23:46:39 +00:00
Laurent Destailleur
6b5f70dbe6 Trans 2011-05-22 20:04:41 +00:00
Laurent Destailleur
5440ad97c6 New: Add default label into stock movement label 2011-05-18 17:18:42 +00:00
Laurent Destailleur
9ff7905f0c Fix: Bad parameter 2011-05-18 16:44:11 +00:00
Laurent Destailleur
39bcf8bd63 Doxygen 2011-05-18 16:42:59 +00:00
tiaris
46057271f2 Add trigger on movement create 2011-05-04 13:37:53 +00:00
Regis Houssin
3b4ea76538 Fix: compatibility with pgsql, replace all addslashes by $this->db->escape in class 2011-02-24 18:11:12 +00:00
Laurent Destailleur
76a7e8f424 Add more units 2010-08-26 14:49:40 +00:00
Laurent Destailleur
98a4430d5f Better postgresql compatibility 2010-08-14 02:44:07 +00:00
Laurent Destailleur
9b48cd789b Fix: Error in stock correction 2010-08-01 17:25:42 +00:00
Laurent Destailleur
5da647ccad Fix: Doxygen 2010-07-27 22:38:28 +00:00
Laurent Destailleur
fc2213a8f1 Doxygen 2010-07-21 12:35:56 +00:00
Laurent Destailleur
f55d82dee5 Fix: A lot of fix in stock value calculation. 2010-07-14 15:41:39 +00:00
Laurent Destailleur
d2acbc35ec Fix: Fix a lot of bugs (missing translations, sql error, country flag not shown, region management, W3C, ajax too slow...) 2010-07-09 23:49:41 +00:00
Laurent Destailleur
ba15e00bfc Fix: SQL Error 2010-05-31 09:45:15 +00:00
Laurent Destailleur
f83954daef Fix: Change status of order to cancel 2010-05-17 12:43:36 +00:00
Philippe Grand
391c595dda according to new tree directory 2010-04-29 08:50:46 +00:00