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

581 Commits

Author SHA1 Message Date
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
2b6029f5d3 FIX Some fix on stock. Condition to view warehouse as column and 
protection against infinite loop
 2016-05-12 19:44:49 +02:00
Laurent Destailleur
c8d98dbfdc FIX error reported by scrutinizer 2016-05-08 11:33:46 +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
b4e5acbaa9 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/product/class/product.class.php
 2016-05-04 14:43:40 +02:00
Laurent Destailleur
568a43214d Add code comment 2016-05-04 13:51:47 +02:00
Laurent Destailleur
911e862a8e Fix missing translation and add a TODO to avoid infinite loop. 2016-05-04 13:49:05 +02:00
Laurent Destailleur
7998cefdd2 Fix mark a deprecated function as deprecated 2016-05-04 13:15:00 +02:00
Laurent Destailleur
f324c662c2 Better update of database cleaning non expected records. 2016-04-30 21:58:00 +02:00
Laurent Destailleur
1bfc7e9b70 Merge pull request #5104 from fappels/patch-1 
Update product.class.php
 2016-04-30 00:28:22 +02:00
BENKE Charlie
49c3c69e30 minor error code 2016-04-29 20:20:47 +02:00
Laurent Destailleur
f5df6488db Merge pull request #5094 from defrance/patch-2 
minor error code
 2016-04-29 20:18:55 +02:00
Laurent Destailleur
88842ccd8b Merge pull request #5111 from nka11/api_improvement 
Api improvement
 2016-04-29 17:13:02 +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
nka11
932b9837fe Merge branch 'fix_5053' into api_improvement 2016-04-28 08:31:10 +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
39bc4d5f02 Optimize load_stock and load_stock_virtual 2016-04-27 14:19:06 +02:00
Laurent Destailleur
810a6c2cb4 Better explanation 2016-04-27 13:39:54 +02:00
nka11
98f757a87a New API methods 
add user to group
get product list by category id
 2016-04-27 08:59:12 +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
Francis Appels
11c31667b8 Update product.class.php 
Fix updatePrice syslog. 
Is travis still running phpunit tests?
 2016-04-25 15:04:33 +02:00
BENKE Charlie
dde4f7ed85 minor error code 2016-04-24 02:01:29 +02:00
Laurent Destailleur
f68f5677bb Start to use the vat code to identify a vat into combo list instead of 
just "rate" and "npr".
 2016-04-18 21:02:14 +02:00
Laurent Destailleur
c2fc9ecf68 Fix scrutinizer warning 2016-04-09 16:12:53 +02:00
Laurent Destailleur
5b55af4d66 NEW Mutualize code: Use one call of function "addThumbs", when possible, 
to generate thumbs files instead of several call of "vignette" function.
 2016-04-09 14:12:21 +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
Laurent Destailleur
f205b04b39 Merge pull request #4960 from defrance/patch-119 
change comment
 2016-04-08 21:32:55 +02:00
Laurent Destailleur
b1c2198154 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/ajax/selectsearchbox.php
	htdocs/core/lib/price.lib.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFacture.class.php
	htdocs/projet/list.php
	htdocs/societe/list.php
 2016-04-07 20:01:52 +02:00
Laurent Destailleur
39b61d6924 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/boxes/box_task.php
	htdocs/core/lib/files.lib.php
 2016-04-07 19:27:53 +02:00
BENKE Charlie
9484dc5b3e change comment 2016-04-06 11:38:34 +02:00
Laurent Destailleur
c340745b78 FIX Option "showstock" was not effective into warehouse list 2016-04-01 11:05:15 +02:00
Laurent Destailleur
2a19326a3f FIX Missing database escaping on supplier price insert/update 2016-03-31 21:47:32 +02:00
Laurent Destailleur
a36abd43fd Merge remote-tracking branch 'origin/3.9' into develop 2016-03-30 16:27:14 +02:00
Laurent Destailleur
07e622a7f8 Introduce () to have code cleaner 2016-03-30 14:04:22 +02:00
Marcos García de La Fuente
362bc106eb FIX Multiprice generator didn't recalculate prices if only the price_base_type property changes 2016-03-30 11:40:57 +02:00
Laurent Destailleur
2b1f57f01e Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	dev/initdata/savedemo.sh
	htdocs/filefunc.inc.php
	htdocs/user/card.php
 2016-03-18 11:54:14 +01:00
philippe grand
d434cee3fa [Qual] Typo 2016-03-17 09:40:05 +01:00
Laurent Destailleur
2e1a63a1f3 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/langs/de_DE/companies.lang
	htdocs/langs/fr_FR/compta.lang
	htdocs/societe/class/societe.class.php
	htdocs/societe/commerciaux.php
	htdocs/societe/consumption.php
 2016-03-10 15:09:30 +01:00
Marcos García de La Fuente
d43d0bfec1 Fixes a little problem with multiprice rules, now undefined ones evaluate to 0% variation 2016-03-08 12:16:32 +01:00
Laurent Destailleur
9e8fcd19aa Fix PHPCS 2016-02-24 17:05:34 +01:00
Laurent Destailleur
0f6e88b460 Update css of warehouse list 2016-02-24 12:18:24 +01:00
Laurent Destailleur
28b8258acb Fix in most cases, we don't need translated value of languages, jsut 
list of language code.
Fix cost price was not updated.
 2016-02-23 19:50:33 +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
4d0b9946f5 FIX Maxi serious problem when updating prices and vat of a product. All 
mode (one price, price per level, ...) were impacted. Localtax setup
were lost.
 2016-02-19 02:41:00 +01:00
Laurent Destailleur
e0a0817123 Merge pull request #4623 from IonAgorria/dynamic-price-changes 
Dynamic price corretions/changes
 2016-02-16 15:11:02 +01:00
Laurent Destailleur
7aaae143fc Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/expedition/card.php
 2016-02-15 02:01:58 +01:00
Laurent Destailleur
3bcc7b0f8f Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/comm/remise.php
	htdocs/expedition/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/price.php
 2016-02-15 01:37:23 +01:00
Ion Agorria
89657d0439 Changed Price Parser functions and added testExpression 2016-02-14 17:28:31 +01:00
Ion Agorria
99efbd3464 Check if dynamic price is enabled 2016-02-14 16:09:47 +01:00