Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 01:58:09 +01:00
Code Issues Packages Projects Releases Wiki Activity
56,821 Commits 36 Branches 190 Tags
e83bb0f50c1b0b51a587a423183563f07f46a982
Commit Graph

2281 Commits

Author SHA1 Message Date
Laurent Destailleur
3784af00ea NEW Selection of fields is available on member list 2016-05-07 18:50:05 +02:00
Juanjo Menent
bba986e975 Fix Remove unused variables 2016-05-06 23:35:56 +02:00
Juanjo Menent
9e7e23a8ab Fix Remove unused variables 2016-05-06 22:30:34 +02:00
Frédéric FRANCE
5c81feab7e Add "no order" 2016-05-04 17:10:12 +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
0cde6ad98f Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2016-04-29 20:43:42 +02:00
Laurent Destailleur
3d9456b202 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/facture/list.php
 2016-04-29 20:42:35 +02:00
Laurent Destailleur
53386e22ea Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/expedition/class/expedition.class.php
	htdocs/index.php
 2016-04-29 20:39:17 +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
174cead40d Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/commande/list.php
 2016-04-29 15:33:57 +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
Laurent Destailleur
39bc4d5f02 Optimize load_stock and load_stock_virtual 2016-04-27 14:19:06 +02:00
Laurent Destailleur
77fcbd3884 FIX: init var at wrong place report incorrect "shippable" flag on draft 
order.
 2016-04-27 12:34:52 +02:00
Laurent Destailleur
bb91fb174b FIX: init var at wrong place report incorrect "shippable" flag on draft 
order.
 2016-04-27 12:30:00 +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
Laurent Destailleur
1a883d870b Uniformize style 2016-04-23 17:35:33 +02:00
Laurent Destailleur
5bfc65676c Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	ChangeLog
	htdocs/commande/class/commande.class.php
	htdocs/filefunc.inc.php
	htdocs/theme/eldy/style.css.php
 2016-04-22 21:02:20 +02:00
Maxime Kohlhaas
4bd239060c Fix order creation bug because of ->client 2016-04-22 09:18:09 +02:00
Laurent Destailleur
8a6d97f257 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-21 02:39:37 +02:00
Laurent Destailleur
ffd10a7560 Complete function loadExpedition to add filter on fk_product 2016-04-21 02:38:49 +02:00
Laurent Destailleur
1e5ff7388c Merge pull request #5031 from marcosgdf/refactor-deprecated-co-client 
NEW Removed deprecated CommonObject::client property
 2016-04-21 01:49:12 +02:00
Florian HENRY
79f408feeb FIX : When cloning an order the order result from clone must be now 2016-04-20 17:17:03 +02:00
nka11
39948968eb Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into api_dev 2016-04-18 19:13:06 +02:00
nka11
4eb1aa59aa fix coding rules 2016-04-18 19:11:28 +02:00
Marcos García de La Fuente
e2c86d3fd8 NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead 2016-04-17 15:24:22 +02:00
Laurent Destailleur
357877b1fe Debug multicurrency and clean properties of some modules 2016-04-12 14:45:59 +02:00
nka11
9ced1dc008 fixing some style and renaming Account to User API 2016-04-11 23:27:43 +02:00
nka11
e5a447c148 Adding more line features (PUT, DELETE, POST) 2016-04-11 22:41:35 +02:00
nka11
1fdcd0e859 Fixed bugs in order api. Added method for posting new lines in order 2016-04-11 18:07:02 +02:00
nka11
132cdd9ed4 Fix coding style errors 2016-04-10 14:15:38 +02:00
nka11
65e4273fdf Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into api_dev 2016-04-10 14:00:00 +02:00
nka11
d0356d6bd0 new api class for accounts, filtering on order api 2016-04-10 13:57:53 +02:00
Laurent Destailleur
dd1f946afe Clean dead code 2016-04-09 19:06:40 +02:00
Laurent Destailleur
27217ccccd Maxi debug of supplier order workflow. 
Add trigger ORDER_SUPPLIER_CLASSIFY_BILLED
Parameter user is added so it is defined into triggers.
 2016-04-09 18:51:09 +02:00
Scrutinizer Auto-Fixer
c2243909e9 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-04-09 13:07:33 +00:00
Laurent Destailleur
1b04eabf1f Merge log with events tabs 2016-04-08 14:28:49 +02:00
Laurent Destailleur
7a48ceb635 Uniformize code for mass actions 2016-04-08 02:53:10 +02:00
Laurent Destailleur
8222624ff0 NEW Can select fields to show on list also for list of customer orders, 
shipments and invoices.
 2016-04-08 02:39:57 +02:00
Laurent Destailleur
24c91933d0 Work on select fields for orders, invoices and shipments 2016-04-08 01:00:02 +02:00
Laurent Destailleur
086345490d Generalize the set of trackid for everyemail sent by dolibarr. 2016-04-07 14:29:07 +02:00
Laurent Destailleur
e1bec46a34 FIX The include file for action on files should not be a template file 
but an action include file.
 2016-04-02 14:16:16 +02:00
Laurent Destailleur
281b06a2d3 NEW Introduce option MAIN_WEIGHT_DEFAULT_UNIT and 
MAIN_VOLUME_DEFAULT_UNIT to force output unit for weight and volume.
 2016-04-01 18:44:23 +02:00
Laurent Destailleur
d14f3d7e2b FIX When deleting last shipment, status "shipment in progress" of order 
must move back to status "validated".
 2016-04-01 16:59:08 +02:00
Laurent Destailleur
97b5026ad8 Uniformize code and css 2016-04-01 16:18:45 +02:00
Laurent Destailleur
2d9c53fc26 NEW Merge all boxes "related objects" into one. This save a lot of room 
on most card and avoid often horizontal scoll.
 2016-03-30 19:18:31 +02:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Laurent Destailleur
630f5a632d Revert "Corrected non-static usages of Form::selectarray function" 
This reverts commit 87cd6e1e40.
 2016-03-25 15:34:37 +01:00