Commit Graph

543 Commits

Author SHA1 Message Date
Laurent Destailleur
f264e25514 Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	htdocs/adherents/liste.php
	htdocs/compta/bank/bankid_fr.php
	htdocs/holiday/index.php
	htdocs/opensurvey/list.php
2014-09-13 19:10:05 +02:00
Laurent Destailleur
8dd9358214 Fix: SQL injection 2014-09-13 19:04:25 +02:00
Cedric
d289306fa4 Security fix 2014-07-12 16:22:49 +02:00
Maxime Kohlhaas
db0fa0afd0 Revert "Fix : ordered should display qty in supplier order not yet send"
This reverts commit f2248d5bc8.
2014-07-03 18:17:34 +02:00
Maxime Kohlhaas
f2248d5bc8 Fix : ordered should display qty in supplier order not yet send 2014-07-03 17:57:36 +02:00
Maxime Kohlhaas
51e4fa0d36 Fix : picto for already ordered product was missing 2014-07-03 15:31:51 +02:00
Maxime Kohlhaas
a26db9ab52 Fix : qty ordered was not including qty already received 2014-07-03 14:47:28 +02:00
Maxime Kohlhaas
a22963e432 Fix : filter by status + was not working if desiredstock not defined 2014-07-03 14:37:30 +02:00
Maxime Kohlhaas
b115e9b943 Fix : replenish function was not working with virtual stock 2014-07-03 12:07:34 +02:00
Maxime Kohlhaas
959c41e8db Fix : virtual stock was not correctly calculated because reception was not included. 2014-07-03 10:24:29 +02:00
Laurent Destailleur
c2f0d84e45 Fix: [ bug #1512 ] Manque des produits dans la page réapprovisionement 2014-07-02 19:35:02 +02:00
Laurent Destailleur
71ee974ddb Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
2014-06-28 14:53:28 +02:00
Raphaël Doursenaud
f5980a1d20 Fix database prefix usage 2014-06-26 15:52:31 +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
Laurent Destailleur
e1a461b3d6 Fix: [ bug #1436 ] réapprovisionnement sur plusieurs pages
Removed also strange image (no way to understand meaning).
2014-06-20 14:34:13 +02:00
Laurent Destailleur
d0dffc8999 Fix: Duplicate column 2014-06-20 14:13:23 +02:00
Maxime Kohlhaas
f2760f74ed Fix replenishment on virtual stock 2014-06-20 09:10:50 +02:00
aspangaro
a725a08c13 Fix :: List limit is not defined or based on limit product configuration
Discussion http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50579-transfert-stock-pas-sur-tous-les-produits#51265
2014-05-28 06:20:56 +02:00
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again)
These were reintroduced by careless merge
2014-05-26 13:51:25 +02:00
Laurent Destailleur
b7f55ea99c Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/liste.php
2014-05-18 11:52:52 +02:00
Laurent Destailleur
09b5971b7d Fix: [ bug #1381 ] PHP Warning when listing stock transactions page 2014-05-11 18:05:59 +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
Laurent Destailleur
417a1232ef Uniformize usage of function price 2014-04-11 18:00:58 +02:00
BENKE Charles
680ce297c5 Update mouvement.php
sometime $year not filled then made "bug" the search
propose to fill with current year in this case
2014-03-25 15:41:20 +01: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
24b0ea6613 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.commande.class.php
2014-03-03 19:38:02 +01:00
Laurent Destailleur
dfb4117bb5 Fix: Invalid image link 2014-03-01 14:58:06 +01:00
Laurent Destailleur
b64a2b2718 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/comm/action/fiche.php
2014-02-28 21:43:29 +01:00
Laurent Destailleur
de159d569a Fix: Missing transactions 2014-02-27 16:40:25 +01:00
Laurent Destailleur
7e3c2d40ba New: Make difference between virtual and physical stock easier to
understand.
2014-02-15 14:14:49 +01:00
Laurent Destailleur
0d03f13777 Add comments 2014-02-12 15:21:06 +01:00
Grand Philippe
1855ba556a fix misspelled words 2014-02-05 17:53:30 +01:00
Laurent Destailleur
8d916215cc New: Add new hook function addMoreActionsButtons to allow a module to
add/replace action buttons into an element.
2014-01-24 12:51:01 +01:00
simnandez
72752f9a30 Fix: Bad navigation into stock product tab 2014-01-23 16:01:27 +01:00
simnandez
cd1313280c Fix: Bad navigation into stock product tab 2014-01-23 16:00:15 +01:00
Laurent Destailleur
12ee5dece2 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-01-14 18:10:14 +01:00
Cedric GROSS
6d4a9833e2 Fix bug on stock calculation for replenishment: wrong order in ifsql. 2014-01-14 18:08:26 +01:00
Grand Philippe
462f65614d Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1 2014-01-13 10:10:17 +01:00
Laurent Destailleur
f0eb98c27a 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:42:49 +01:00
Laurent Destailleur
9e9a386852 Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
	htdocs/compta/facture.php
2013-11-21 02:19:21 +01:00
Laurent Destailleur
e63dcc5343 Fix: [ bug #1119 ] If no country is selected for a warehouse or thids
card,
broken IMG is shown
2013-11-21 02:14:25 +01:00
Maxime Kohlhaas
1c6edf2d03 Fix : error in replenish SQL 2013-11-08 14:07:11 +01:00
Laurent Destailleur
305ca25267 New: Add menu entry to page massstockmove.php 2013-10-20 14:05:51 +02:00
Laurent Destailleur
16b2741834 New: Finished page to make mass stock movement 2013-10-18 19:23:27 +02:00