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

321 Commits

Author SHA1 Message Date
Frédéric FRANCE
d986909109
loadlangs 2018-05-26 23:52:52 +02:00
Laurent Destailleur
ccd9aa8059 Fight against dolibarr warnings 2018-04-21 12:16:12 +02:00
Laurent Destailleur
55d3e72463 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/contact/class/contact.class.php
	htdocs/societe/card.php
 2018-03-12 19:02:30 +01:00
Laurent Destailleur
d5d6939fd9 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-03-11 19:28:39 +01:00
Maxime Kohlhaas
fd36ade61a Fix unit in replenish #7225 2018-03-10 11:20:32 +01:00
Laurent Destailleur
af1028576d Fix on search all (trim search + search from smartphone). 2017-12-12 11:31:30 +01:00
Laurent Destailleur
a0231b5c60 Fix responsive 2017-12-01 12:55:28 +01:00
Laurent Destailleur
9f235e1ff6 Standardize database: field ref of warehouse was renamed label -> ref 2017-11-24 15:27:00 +01:00
Laurent Destailleur
8e0da9bfeb Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/holiday/document.php
 2017-10-04 13:32:53 +02:00
arnaud
7f807986d7 FIX replenish if line test GETPOST on line 0 2017-09-27 10:53:29 +02:00
Laurent Destailleur
051ca6fdc4 Merge pull request #7162 from hguibourgdev/patch-5 
NEW Can show stock in alert even if alter is set to 0
 2017-09-25 18:17:18 +02:00
Laurent Destailleur
5b1f5b0f20 Fix translation done twice into field title of array 2017-08-02 13:31:53 +02:00
hguibourgdev
3825e7fd52 Update replenish.php 
FIX ">=" instead of ">" for alert test in order to work when negatif stock are allowed
 2017-07-15 18:55:52 +02:00
Laurent Destailleur
2870798d07 Fix remove warnings 2017-07-13 00:35:10 +02:00
Regis Houssin
bfd6116e5b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2017-06-06 15:03:36 +02:00
Laurent Destailleur
02b5d9e6f7 FIX #6945 2017-06-06 10:53:53 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Alexandre SPANGARO
4dc7d5cd8d Fix : tooltip on bank in customer invoice card 2017-05-14 21:20:35 +02:00
Laurent Destailleur
e5c898e0d6 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	build/makepack-dolibarr.pl
	htdocs/fichinter/list.php
	htdocs/product/list.php
	htdocs/projet/tasks/list.php
 2017-05-10 00:48:27 +02:00
Laurent Destailleur
6d01bd712d FIX Better sanitizing of search all parameter. 2017-05-09 19:36:10 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
Laurent Destailleur
8e70c4a0b7 Work on 6.0 new look and feel 2017-03-30 15:39:50 +02:00
Quentin Vial-Gouteyron
bf8d510541 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2017-03-06 15:52:59 +01:00
Quentin Vial-Gouteyron
b378279440 New_filter_to_add_draft_order_to_validated_one 2017-03-06 15:50:17 +01:00
Laurent Destailleur
c6e0a4cc87 Fix column label 2017-02-07 12:39:45 +01:00
fappels
c3b43e18d1 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status 2016-12-05 18:15:08 +01:00
fappels
3ca9664595 Filter stock on warehouse status for replenishment 
Do not show stock of closed warehouse
 2016-12-05 18:14:42 +01:00
Laurent Destailleur
761a795294 Maxi debug on REST APIs 2016-12-05 13:31:29 +01:00
Laurent Destailleur
da92be1a9f Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fichinter/card.php
	htdocs/fourn/facture/card.php
 2016-11-22 20:55:57 +01:00
Laurent Destailleur
cbd85f7b82 FIX #5958 no discount on supplier command made by replenishment 2016-11-22 20:50:13 +01:00
Laurent Destailleur
ad981a0f07 FIX the key for getEntity was different for same element. 2016-11-18 12:54:08 +01:00
Laurent Destailleur
aad4380689 Uniformise code 2016-10-24 20:52:21 +02:00
Laurent Destailleur
92dc385307 Merge pull request #5838 from atm-gauthier/develop_NEW_filter_by_supplier_on_replenishment_card 
Develop new filter by supplier on replenishment card
 2016-10-11 20:04:02 +02:00
gauthier
fee0a88d27 Merge branch 'NEW_filter_by_supplier_on_replenishment_card' of github.com:atm-gauthier/dolibarr into develop_NEW_filter_by_supplier_on_replenishment_card 2016-10-07 09:25:18 +02:00
gauthier
18496f9159 FIX : params order 2016-10-07 09:19:10 +02:00
gauthier
ee014681b0 Merge branch 'NEW_filter_by_supplier_on_replenishment_card' of github.com:atm-gauthier/dolibarr into develop_NEW_filter_by_supplier_on_replenishment_card 2016-10-05 15:30:23 +02:00
gauthier
9c8ecdc8d8 NEW : filter by supplier on replenish.php 2016-10-05 15:06:30 +02:00
florian HENRY
d3146234b8 FIX : New add limit stock product by warehouse #5764 for PgSQL 2016-10-04 09:23:13 +02:00
Laurent Destailleur
8fa8bc7d34 Rename table for a better understanding 2016-09-22 11:39:43 +02:00
gauthier
dc15eb079a FIX : keep params when we search or skip to another page 2016-09-20 14:38:05 +02:00
gauthier
a698e40c45 NEW : filter fk_warehouse on replenishment card 2016-09-20 11:55:38 +02:00
Laurent Destailleur
54df49aebe Fix strict sql 2016-08-02 13:36:16 +02:00
paolo
ff95bb1644 fix #4467 2016-06-04 18:31:31 +02:00
Juanjo Menent
99a28a9dcd Fix Travis error introduced in commit '236ecf01' 2016-06-03 16:15:27 +02:00
Laurent Destailleur
5106f40a56 Merge branch 'develop_NEW_decrease_stock_expedition_classify' of 
https://github.com/atm-alexis/dolibarr into
atm-alexis-develop_NEW_decrease_stock_expedition_classify

Conflicts:
	htdocs/expedition/class/expedition.class.php
 2016-06-02 11:23:49 +02:00
Laurent Destailleur
7063b26018 Debug 4.0 2016-05-17 19:32:19 +02:00
Alexis Algoud
e74e70287f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_decrease_stock_expedition_classify 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/product/stock/replenish.php
 2016-05-14 19:14:39 +02:00
Laurent Destailleur
0419987b6f NEW Add view of virtual stock into product list (when appropriate) 2016-04-28 15:22:38 +02:00
Laurent Destailleur
2beb16ef32 Remove limit on product ref on replenishment 2016-04-27 12:30:36 +02:00
Alexis Algoud
b46c14812c Merge branch 'NEW_decrease_stock_expedition_classify' of github.com:atm-alexis/dolibarr into develop 2016-04-25 18:37:47 +02:00
Alexis Algoud
b472a244db NEW decrease stock on expedition closing/classifying 2016-04-25 18:33:39 +02:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Laurent Destailleur
9c8d69eaa9 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
 2016-02-19 04:46:11 +01:00
Laurent Destailleur
3864bd35c9 Fix NPR Vat is working correctly with multiprice too 2016-02-19 03:59:43 +01:00
Laurent Destailleur
9da0164d90 Uniformize code for lists 2016-02-07 15:50:48 +01:00
Laurent Destailleur
db7a98f0ef Fix: When a payment mode was disabled, it was not visible on old 
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
 2015-12-21 13:56:59 +01:00
philippe grand
0fe64c6091 [Qual] Uniformize code 2015-12-14 20:54:55 +01:00
Laurent Destailleur
f5eaeb2fb5 Some minor fixes 2015-10-28 22:51:06 +01:00
Juanjo Menent
de3f1b5559 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-09-04 18:23:33 +02:00
Regis Houssin
1a08f65942 Fix: problem with pagination 2015-09-02 17:22:19 +02:00
aspangaro
9d2e964b00 Fix: print_liste_field_titre(''); 2015-06-26 06:23:29 +02:00
Raphaël Doursenaud
b8d9c20731 [Qual] Fixed HTML input form disabled attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form disabled attribute should not have a value.
 2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
859d1b0df9 [Qual] Fixed HTML input form checked attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form checked attribute should not have a value.
 2015-05-07 14:21:14 +02:00
jfefe
f5db4d5bb7 Fix: missing getEntity function 2015-04-19 03:05:37 +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
Maxime Kohlhaas
6f9fb6a282 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2015-03-10 15:18:08 +01:00
Laurent Destailleur
8a00109baf Fix: Several bugs int replenishment feature. 2015-03-01 16:05:20 +01:00
Laurent Destailleur
560f1a43cd Fix: Several bugs int replenishment feature. 2015-03-01 16:04:34 +01:00
Maxime Kohlhaas
2547d96ffd New : Use supplier default payment terms when creating a replenish order 2015-02-20 09:26:53 +01:00
Maxime Kohlhaas
504cc89078 New : replenish function adds new lines into already existing draft supplier order instead of creating a new supplier order 2015-02-20 09:24:33 +01:00
Laurent Destailleur
5ac63ec534 Solve fixme. 2014-10-03 02:00:50 +02:00
Regis Houssin
4248c7bed2 Fix: strict mode paradise 2014-10-02 09:30:31 +02:00
Laurent Destailleur
e496823778 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	.travis.yml
	ChangeLog
	htdocs/fourn/commande/fiche.php
	htdocs/install/mysql/migration/3.5.0-3.6.0.sql
	htdocs/product/stock/replenish.php
 2014-07-04 14:14:40 +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
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
Laurent Destailleur
c2f0d84e45 Fix: [ bug #1512 ] Manque des produits dans la page réapprovisionement 2014-07-02 19:35:02 +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
Maxime Kohlhaas
f2760f74ed Fix replenishment on virtual stock 2014-06-20 09:10:50 +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
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
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
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
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
56730741bc New: Add page to make mass stock transfert. 2013-10-11 13:12:21 +02:00
Laurent Destailleur
a11a0d6491 Fix: debug replanishment feature 2013-10-09 21:09:15 +02:00
Laurent Destailleur
f4a83f0851 Qual: Debug of replenishment feature 2013-10-09 20:30:49 +02:00
Cédric Salvador
967c20e3e9 Improved error message 2013-09-16 14:51:22 +02:00
Cédric Salvador
c62c7c0b1f Stock calculation was wrong in certain cases, should be ok now 2013-09-16 14:37:53 +02:00
Laurent Destailleur
72557437ef Checkstyle 2013-09-10 14:19:36 +02:00
Cédric Salvador
413d76ce51 fixed error level 2013-09-06 09:56:07 +02:00
Raphaël Doursenaud
1db9cdac28 Fixed pagination 2013-09-06 09:56:07 +02:00
Cédric Salvador
d8e5fbc662 keep the alert filter when changing page 2013-09-06 09:56:06 +02:00
Cédric Salvador
a9ca9c04ef Fixed request returning nothing when there's no records in llx_product_stock 2013-09-06 09:56:06 +02:00
Cédric Salvador
0a6079934b alertonly checkbox stays checked 2013-09-06 09:56:06 +02:00
Cédric Salvador
41ad9bdb7f frenglish is bad 2013-09-06 09:56:06 +02:00
Cédric Salvador
6015a36183 filter on stock alert 2013-09-06 09:56:06 +02:00
Cédric Salvador
bbae47c48f natural search 2013-09-06 09:56:06 +02:00
Cédric Salvador
b58297a791 fixed warning showing up when searching 2013-09-06 09:56:05 +02:00
Cédric Salvador
6a51f5f87a don't jump to the product card when there's only one research result 2013-09-06 09:56:05 +02:00
Cédric Salvador
3c93aac071 init cond_reglement_id and mode_reglement_id to 0 in orders creations to avoid SQL errors 2013-08-01 15:03:47 +02:00
Cédric Salvador
1993964a46 don't display product if desiredstock = 0 or null 2013-07-29 12:31:17 +02:00
Cédric Salvador
44bde866ee link to go to the second tab and only display orders related to a certain product 2013-07-29 12:31:17 +02:00
Cédric Salvador
c756d34940 changed pictos used in replenish.php 2013-07-29 12:31:17 +02:00
Cédric Salvador
72a3bd9bdd moved warning picto 2013-07-29 12:31:17 +02:00
Raphaël Doursenaud
7d573bce1d PSR-0 coding style 2013-07-29 12:31:17 +02:00
Raphaël Doursenaud
18ec06a7f9 Allowed displaying products without buying price 2013-07-29 12:31:17 +02:00
Raphaël Doursenaud
8d6591ac2f Better comment 2013-07-29 12:31:16 +02:00
Cédric Salvador
5643a714ce changed tab name 2013-07-29 12:31:16 +02:00
Cédric Salvador
d4052f7b9c warning message if you try to create orders without selecting any product 2013-07-29 12:31:16 +02:00
Cédric Salvador
9ff183d432 debug checkbox + use textfields in the to order column 2013-07-29 12:31:16 +02:00
Cédric Salvador
6bf95db95e checkbox + improve order detection 2013-07-29 12:31:16 +02:00
Cédric Salvador
3df097695d removed useless variable 2013-07-29 12:31:16 +02:00
Cédric Salvador
a607cb677d Bug fix: stock to buy now computes correctly when the stock too low picto is present 2013-07-29 12:31:15 +02:00
Cédric Salvador
5062eb8006 check types on getpost + date research 2013-07-29 12:31:15 +02:00
Cédric Salvador
4b90157aa2 switch from print to echo 2013-07-29 12:31:15 +02:00
Raphaël Doursenaud
7abf23c471 PSR coding style 2013-07-29 12:31:15 +02:00
Cédric Salvador
fe8eb1be92 code cleanup 2013-07-29 12:31:14 +02:00
Cédric Salvador
d1550173cd changed valid button label, position and look 2013-07-29 12:31:14 +02:00
Cédric Salvador
1a41511874 redirect user after orders creation 2013-07-29 12:31:14 +02:00
Cédric Salvador
2c3053b9ee selects 2013-07-29 12:31:14 +02:00
Cédric Salvador
72afadb84e fixed success message showing up even when you don't create orders 2013-07-29 12:31:14 +02:00
Cédric Salvador
787125cf12 reformat 2013-07-29 12:31:14 +02:00
Cédric Salvador
3b6fa4a52b message when succeeds/fails to create orders 2013-07-29 12:31:14 +02:00
Cédric Salvador
3c04c6c35b Split the page in two tabs, filters and pagination should work now 2013-07-29 12:31:13 +02:00
Cédric Salvador
407ffb8dd7 typo 2013-07-29 12:31:13 +02:00
Cédric Salvador
47177a2590 typo 2013-07-29 12:31:13 +02:00
Cédric Salvador
c919826104 psr 0 2013-07-29 12:31:13 +02:00
Cédric Salvador
ef8d05676f display the ordered quantity in the ordered column 2013-07-29 12:31:13 +02:00
Cédric Salvador
b261ef2aa2 ordered column 2013-07-29 12:31:13 +02:00
Cédric Salvador
c0c2f9af42 fixed error when trying to create an order when a line has no associated supplier 2013-07-29 12:31:12 +02:00
Cédric Salvador
bcbe940ac0 fixed SQL error when trying to generate an order without selecting any product line 2013-07-29 12:31:12 +02:00
Cédric Salvador
52cfecd0af added an option to use virtual stock instead of physical stock 2013-07-29 12:31:12 +02:00
Cédric Salvador
d4aa2a0f79 show service lines only if the stock services option is enabled 2013-07-29 12:31:12 +02:00
Cédric Salvador
bdb2a00539 products now show up in the list even when they don't have a line in llx_product_stock 2013-07-29 12:31:12 +02:00
Cédric Salvador
d31064a8b1 comments 2013-07-29 12:31:11 +02:00
Cédric Salvador
e5a70ade85 filter out lines where stock > desiredstock 2013-07-29 12:31:11 +02:00
Cédric Salvador
8d00838fa5 moved page + added link in the left menu 2013-07-29 12:31:11 +02:00
Raphaël Doursenaud
2f5f96dc13 PSR coding style 2013-07-29 12:31:10 +02:00
Cédric Salvador
f0243646df code cleanup 2013-07-29 12:31:10 +02:00
Cédric Salvador
2a4ce81f44 changed valid button label, position and look 2013-07-29 12:31:10 +02:00
Cédric Salvador
2900227236 redirect user after orders creation 2013-07-29 12:31:10 +02:00
Cédric Salvador
9dfa5c4218 selects 2013-07-29 12:31:09 +02:00
Cédric Salvador
6e55d1c471 fixed success message showing up even when you don't create orders 2013-07-29 12:31:09 +02:00
Cédric Salvador
2c82484d45 reformat 2013-07-29 12:31:09 +02:00
Cédric Salvador
4c50b23b40 message when succeeds/fails to create orders 2013-07-29 12:31:09 +02:00
Cédric Salvador
a637127599 Split the page in two tabs, filters and pagination should work now 2013-07-29 12:31:09 +02:00
Cédric Salvador
e9ef91cdbc typo 2013-07-29 12:31:08 +02:00
Cédric Salvador
8517706ec2 typo 2013-07-29 12:31:08 +02:00
Cédric Salvador
2f6c979c32 psr 0 2013-07-29 12:31:08 +02:00
Cédric Salvador
e068655e6e display the ordered quantity in the ordered column 2013-07-29 12:31:08 +02:00
Cédric Salvador
dcc6a9aad8 ordered column 2013-07-29 12:31:08 +02:00
Cédric Salvador
47a07c1c29 fixed error when trying to create an order when a line has no associated supplier 2013-07-29 12:31:07 +02:00
Cédric Salvador
d262f044ce fixed SQL error when trying to generate an order without selecting any product line 2013-07-29 12:31:07 +02:00
Cédric Salvador
9b4601bcf2 added an option to use virtual stock instead of physical stock 2013-07-29 12:31:07 +02:00
Cédric Salvador
737aa7819f show service lines only if the stock services option is enabled 2013-07-29 12:31:07 +02:00
Cédric Salvador
80a9dbfb90 products now show up in the list even when they don't have a line in llx_product_stock 2013-07-29 12:31:07 +02:00
Cédric Salvador
9f4e641cd9 comments 2013-07-29 12:31:06 +02:00
Cédric Salvador
66cb265d2b filter out lines where stock > desiredstock 2013-07-29 12:31:06 +02:00
Cédric Salvador
da5bbd0a08 moved page + added link in the left menu 2013-07-29 12:31:06 +02:00