Commit Graph

3774 Commits

Author SHA1 Message Date
fappels
a9ceb46f97 Add parameter to load all lot from lines of object in cache
If you want use the lot stock selector in mutiple lines you can add
lines array. If you don't give a product id or a lines array, no lot
numbers will be loaded.
2017-10-29 20:40:56 +01:00
fappels
7f7e621ea9 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into 7.0_new_shipment_update 2017-10-24 10:53:34 +02:00
fappels
fe2acb2cb6 Add form select for lot numbers 2017-10-23 22:17:24 +02:00
Laurent Destailleur
285203ed0e Reduce diplicate code 2017-10-22 17:00:35 +02:00
Laurent Destailleur
36ad17cc95 Work on module builder 2017-10-22 16:45:18 +02:00
Laurent Destailleur
c6e5115d34 Set default limit to 100 on all rest api that list 2017-10-22 15:42:19 +02:00
Laurent Destailleur
4a1834ee29 #7411 2017-10-22 04:23:17 +02:00
Laurent Destailleur
c9fceaad3c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/bank/index.php
	htdocs/fourn/facture/card.php
2017-10-22 04:04:26 +02:00
Laurent Destailleur
030cea6a0f Merge pull request #7664 from frederic34/patch-1
keep vat input with multiprices product creation
2017-10-22 02:42:44 +02:00
Laurent Destailleur
19a5780f7f Clean code 2017-10-20 23:49:20 +02:00
Laurent Destailleur
abd5251330 Better responsive 2017-10-19 19:53:29 +02:00
Frédéric FRANCE
5afd2695fb keep vat input with multiprices product creation 2017-10-19 18:33:15 +02:00
florian HENRY
b0c68ddc61 fix displaying accountancy code 2017-10-19 12:35:59 +02:00
Laurent Destailleur
7f85d73001 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/card.php
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/contrat/card.php
	htdocs/expensereport/card.php
	htdocs/fichinter/list.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/card.php
	htdocs/fourn/paiement/card.php
	htdocs/livraison/card.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/societe/rib.php
	htdocs/supplier_proposal/list.php
	htdocs/user/card.php
2017-10-18 19:51:29 +02:00
Laurent Destailleur
8626d6279a Fix perm to delete files 2017-10-18 17:21:30 +02:00
Laurent Destailleur
347883b7be Code comment 2017-10-18 10:39:36 +02:00
Scrutinizer Auto-Fixer
165741517e Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-13 11:28:26 +00:00
Laurent Destailleur
8c5cf9ea45 Fix date output 2017-10-12 18:04:47 +02:00
Laurent Destailleur
33624e1001 NEW Attaching doc automatically in email is now a parameter of template. 2017-10-08 16:34:42 +02:00
Laurent Destailleur
df2f73bdc3 Fix quick search on product/services 2017-10-07 20:36:32 +02:00
Laurent Destailleur
e40bffb0d5 Fix bug reported by scrutinizer 2017-10-07 20:21:47 +02: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
Regis Houssin
45de1ca21e Fix: check security 2017-10-03 19:09:46 +02:00
Regis Houssin
4537e5472b Fix: refactorization of "getListForItem" function 2017-10-03 19:01:54 +02:00
Regis Houssin
ed5dca652d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug_restapi 2017-10-03 17:32:40 +02:00
Laurent Destailleur
a501a20487 NEW Search filters in lists are restored when using "back to list" 2017-10-03 16:00:52 +02:00
Regis Houssin
f8f4ff6d21 Fix: missing include api_categories class 2017-10-03 13:07:07 +02:00
Laurent Destailleur
f007f9e7e5 NEW Add new property visible dy default on lists on extrafields 2017-09-29 13:26:44 +02:00
arnaud
8866683a72 Merge branch '6.0' of github.com:Dolibarr/dolibarr into FIX_replenish_stock_line_0 2017-09-27 10:55:49 +02:00
arnaud
7f807986d7 FIX replenish if line test GETPOST on line 0 2017-09-27 10:53:29 +02:00
Laurent Destailleur
f1a563625b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-09-26 22:11:00 +02:00
Laurent Destailleur
d7dd6ed334 Fix undefined var 2017-09-26 16:15:22 +02:00
Laurent Destailleur
1002923dea Fix css 2017-09-26 10:58:24 +02:00
Laurent Destailleur
7f420f3246 Complete vat rates for india 2017-09-26 10:54:07 +02:00
Laurent Destailleur
4f76545b62 Add missing fields to manage localtax on supplier products 2017-09-26 10:47:08 +02:00
Laurent Destailleur
5482f80c0e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-26 10:30:47 +02:00
Laurent Destailleur
59571b1ce1 FIX #7473 Mass update of vat rates and other bugs on localtax 2017-09-26 10:29:44 +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
Regis Houssin
16941f1d9d Fix: uniformize code 2017-09-25 16:46:13 +02:00
Laurent Destailleur
e3da4188e2 GETPOST must not clean data for text input. 2017-09-25 00:16:52 +02:00
Laurent Destailleur
934edd9f5a Merge branch 'develop' into 6.0-api 2017-09-24 22:01:07 +02:00
Laurent Destailleur
91d303465d NEW Can add html content on right of tabs 2017-09-24 01:39:06 +02:00
Laurent Destailleur
fc5c9ad2f2 Merge pull request #7436 from fappels/6.0_Fix_expedition_error_handling
Fix batch required for lot product error message.
2017-09-20 17:33:05 +02:00
Regis Houssin
77fea1983c Fix: wrong supplier product price id 2017-09-20 16:57:38 +02:00
Laurent Destailleur
1e33495f42 Fix remove warnings 2017-09-19 00:31:51 +02:00
Regis Houssin
cdd1473cfa Fix: avoid Warning: A non-numeric value encountered 2017-09-18 16:30:01 +02:00
Laurent Destailleur
291a0d46e6 Fix edit of categories 2017-09-18 01:39:39 +02:00
Laurent Destailleur
dece156a99 NEW Add supplier proposals into stats of product page. 2017-09-17 18:08:43 +02:00
Laurent Destailleur
a3c555049d NEW Add supplier proposals into stats of product page. 2017-09-17 18:08:23 +02:00
Laurent Destailleur
ad40d27324 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/actions_sendmails.inc.php
2017-09-16 12:22:18 +02:00