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

213 Commits

Author SHA1 Message Date
Laurent Destailleur
58cac2d895 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/product/stock/product.php
 2015-11-05 22:09:54 +01:00
Laurent Destailleur
fe78996026 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/product/stock/fiche.php
	htdocs/product/stock/valo.php
 2015-11-05 22:04:18 +01:00
Christophe Battarel
f566b38296 FIX pmp 2015-11-05 15:29:51 +01:00
Florian HENRY
89b723b2a7 FIX : multientity warehouse management 2015-09-08 16:23:00 +02:00
Florian HENRY
52cb9581ff Fix multientity stock management 2015-09-08 16:00:13 +02:00
Laurent Destailleur
1fb40565f4 Fix bad parameters of function select_date 2015-07-12 12:50:24 +02:00
Laurent Destailleur
acd693b513 Fix phpcs 2015-06-01 21:37:09 +02:00
Laurent Destailleur
523b04a315 Work on finishing 2015-05-31 17:31:15 +02:00
Juanjo Menent
c5101ae5ea Code fixes 2015-05-07 20:07:47 +02:00
Juanjo Menent
f6d2320c34 Merge pull request #2756 from aternatik/fix_label_product 
FIX : remove deprecated property 'libelle' on product object
 2015-05-05 20:25:08 +02:00
Laurent Destailleur
c89c89c73e Mutualise code and some fixes for stock management. 2015-05-04 22:02:54 +02:00
jfefe
7e0357dcf9 FIX : remove deprecated property 'libelle' on product object 2015-05-04 03:03:24 +02:00
Maxime Kohlhaas
bcf9e7fb37 Fix : use getentity for stock sharing 2015-04-18 23:08:21 +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
1bbecc0912 Restore link to stock for products. 2015-04-08 19:26:36 +02:00
Juanjo Menent
1f4a131691 Fix: Bad permission assignments for stock movements actions 
Conflicts:
	htdocs/product/stock/product.php
 2015-04-07 20:43:27 +02:00
Juanjo Menent
d7ba9b3312 Fix: Bad permission assignments for stock movements actions 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/product/stock/mouvement.php
 2015-04-07 20:40:48 +02:00
Juanjo Menent
9d8cb459f1 Fix: Bad permission assignments for stock movements actions 2015-04-07 20:28:45 +02:00
Laurent Destailleur
6fa0234409 Uniformize code 2015-04-07 03:00:11 +02:00
Laurent Destailleur
8e9c1c4747 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/list.php
	htdocs/core/class/notify.class.php
	htdocs/core/login/functions_dolibarr.php
	htdocs/exports/export.php
	htdocs/langs/en_US/admin.lang
 2015-04-01 16:33:39 +02:00
Marcos García de La Fuente
831177ef99 Implemented constants for Product class 2015-03-30 03:14:07 +02:00
Laurent Destailleur
3cc4358e72 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/commande/liste.php
	htdocs/product/stock/product.php
 2015-03-29 15:24:17 +02:00
Maxime Kohlhaas
b250c5588e Fix : Quantity displayed for virtual stock explanations was wrong 2015-03-25 16:11:36 +01:00
Laurent Destailleur
52425648bf NEW: When using transfer or correct stock from warehouse, after 
recording we go back to the warehouse page.
 2015-03-04 01:54:26 +01:00
Laurent Destailleur
e4e49e8a0b Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/product/stock/product.php
 2015-02-12 15:41:48 +01:00
Laurent Destailleur
206a453ce2 Solve confusion into number of order or qty into order. 2015-02-12 15:40:06 +01:00
Laurent Destailleur
c727e2b8ec Fix bad translation 
Conflicts:
	htdocs/product/stock/product.php
 2015-02-12 15:29:21 +01:00
Laurent Destailleur
b49c8f84b6 Fix bad translation 2015-02-12 15:22:04 +01:00
Laurent Destailleur
689354f927 New: A default label is suggested for stock correction and transfer 
instead of empty string.
 2015-02-11 23:54:42 +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
frederic34
b850b7b448 Merge remote branch 'upstream/develop' into tooltip 
Conflicts:
	htdocs/langs/en_US/sendings.lang
 2015-01-30 16:45:24 +01:00
frederic34
736bee565c Tooltip everywhere 2015-01-30 16:40:33 +01:00
Laurent Destailleur
4fdc287717 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/admin/menus.php
	htdocs/fourn/commande/card.php
	htdocs/install/check.php
 2015-01-30 15:53:06 +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
Laurent Destailleur
9850b753fa Tooltip at wrong place. 2015-01-28 19:37:09 +01:00
Laurent Destailleur
e379b2f802 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/product/stock/product.php
 2015-01-13 15:34:08 +01:00
Laurent Destailleur
e6d016cc48 Fixed: pmp update after makign a stock move. 2015-01-12 20:55:15 +01:00
Laurent Destailleur
31fd03790e Fixed: Prices visible into stock tab. 
Conflicts:
	htdocs/product/stock/product.php
 2015-01-12 18:26:11 +01:00
Laurent Destailleur
1d2c8bbd4d Fixed: Prices visible into stock tab. 2015-01-12 18:16:24 +01:00
KreizIT
ce3a60b2a3 Allow warehouse transfer for batched product 2015-01-06 13:23:51 +01:00
KreizIT
a7fc2b3779 Fix / Improve : [ bug #1747 ] Remove creation of batch 'Undefined' 2015-01-05 17:55:59 +01:00
Laurent Destailleur
711b033844 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/html.form.class.php
	htdocs/product/stock/card.php
 2014-12-14 12:35:13 +01:00
Laurent Destailleur
9be99b2987 Fixed: We must use PMP of product. Not warehouse. 2014-12-09 14:27:02 +01:00
Laurent Destailleur
6a70af2b67 Fixed: bug into produc batch management 2014-12-09 14:03:10 +01:00
Laurent Destailleur
f884f16564 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/boxes.php
	htdocs/comm/action/card.php
	htdocs/core/class/html.formfile.class.php
 2014-12-03 12:54:42 +01:00
Laurent Destailleur
7afe9de1c0 Start to debug batch/serial module 2014-12-03 00:42:14 +01:00
Laurent Destailleur
01209ff844 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/product/stock/card.php
 2014-11-30 14:15:38 +01:00
Laurent Destailleur
7303983610 Fixed: Ton of old bugs when debugging POS. 2014-11-30 01:35:58 +01:00
Laurent Destailleur
d9cb9c1585 Merge pull request #2102 from aspangaro/develop-center 
Task 1603 - Remove <center> deprecated HTML5 tags
 2014-11-27 23:58:44 +01:00