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

3166 Commits

Author SHA1 Message Date
Xebax
ce6d7046be REST API: remove getByCategory() from Products 
because the same feature is available with GET /products/.
 2016-06-20 17:56:33 +02:00
Xebax
9a509dd0ee REST API: add the 'category' filter in /products/ 
and fix the 'to_sell' and 'to_buy' filters.
 2016-06-20 17:56:33 +02:00
Xebax
d7c8a466b1 REST API: fix deleting a product/service. 
Add a User parameter to the Product::delete() method to explicitly set
the user that performs the action instead of using a global variable.
In the calls to Product::delete() with a fetched object, remove the
deprecated parameter $id.
 2016-06-20 17:56:33 +02:00
Xebax
58c25ff665 REST API: fix the error 500 when updating a product. 2016-06-20 17:56:33 +02:00
Xebax
f03d6e1bed REST API: replace the /product/ API by /products/. 
Added some FIXME:
 - the put() method does its job but the API returns an error 500
 - delete() does not work.
 2016-06-20 17:56:33 +02:00
Laurent Destailleur
10f2d7cd67 Fix Debug and minor fixes 2016-06-20 10:54:02 +02:00
Laurent Destailleur
8187dc2006 Fix css 2016-06-19 16:07:34 +02:00
Laurent Destailleur
5b5b7a2bf9 FIX Bad value used for task warning delay 
FIX Compatibility datee and date_end for warning of tasks
 2016-06-15 14:05:48 +02:00
Laurent Destailleur
6034ba658c Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2016-06-10 18:59:05 +02:00
Laurent Destailleur
758f5897d3 Fix Missing message to explain record is saved 2016-06-09 21:22:07 +02:00
Laurent Destailleur
8b446faa53 Fix field not sortable 2016-06-08 11:59:48 +02:00
Laurent Destailleur
653387ba95 Fix pagination on movement list 2016-06-08 11:58:37 +02:00
Laurent Destailleur
73d465a8e8 Fix missing use of natural_search 2016-06-08 11:44:00 +02:00
Laurent Destailleur
59c6c90200 Remove a FIXME. 2016-06-08 11:40:50 +02:00
Laurent Destailleur
240c4baba8 FIX filter on stock movement 2016-06-08 11:29:48 +02:00
Laurent Destailleur
f5d7c6fda5 Fix translation of desired stock (this is more clear) 2016-06-08 09:57:03 +02:00
Laurent Destailleur
f552f3a7d5 Fix missing $notrigger on product delete 2016-06-07 20:51:06 +02:00
Laurent Destailleur
9019576394 Fix css class opacitymedium was not used everywhere. 2016-06-07 15:58:02 +02:00
Laurent Destailleur
5db6bcd4a8 Fix contextpage lost on submitting form or sorting 2016-06-07 14:06:00 +02:00
Laurent Destailleur
293c8e145a Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/imports/import.php
	htdocs/langs/en_US/admin.lang
 2016-06-05 02:20:27 +02:00
Maxime Kohlhaas
c3cf72afcc Merge pull request #5296 from aschio/develop 
FIX #5134
 2016-06-04 18:46:33 +02:00
cla
b440ad4e7b FIX #5134: fixed action 'edit' top page 2016-06-04 18:44:10 +02:00
paolo
ff95bb1644 fix #4467 2016-06-04 18:31:31 +02:00
cla
9ac05fa8f2 FIX #5134 2016-06-04 18:17:13 +02:00
Maxime Kohlhaas
3ef9fe2c40 Fix product supplier price modification with multicompany 2016-06-04 18:10:40 +02:00
Juanjo Menent
8f617b196a Fix printing following the rules 2016-06-04 15:51:28 +02:00
Juanjo Menent
99a28a9dcd Fix Travis error introduced in commit '236ecf01' 2016-06-03 16:15:27 +02:00
Laurent Destailleur
0f53993c6f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-02 11:24:24 +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
b8ee75ce23 Merge pull request #5248 from IonAgorria/patch-2 
Fix: Fill ref_supplier in product get_buyprice
 2016-06-02 10:06:17 +02:00
Laurent Destailleur
40005b8f65 FIX Missing search on barcode, only if defined 2016-06-01 12:15:54 +02:00
Ion Agorria
ade417855b Fill ref_supplier in product get_buyprice 2016-05-29 13:45:26 +02:00
Juanjo Menent
d8897214cd Fix issues with strict mode 2016-05-19 21:01:52 +02:00
Laurent Destailleur
b82eabe25f Code comment 2016-05-19 18:52:12 +02:00
Laurent Destailleur
e7072185ab Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/comm/propal.php
 2016-05-18 20:47:57 +02:00
Laurent Destailleur
49c2549400 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/comm/propal.php
 2016-05-18 20:40:09 +02:00
Laurent Destailleur
4e46a01d51 Fix regression introduced with option SUPPLIERORDER_WITH_NOPRICEDEFINED 2016-05-17 22:59:46 +02:00
Laurent Destailleur
89d37ccc62 Fix translation 2016-05-17 21:55:39 +02:00
Laurent Destailleur
7bbb3a7da1 Supplier proposal was missing 2016-05-17 19:34:23 +02:00
Laurent Destailleur
7063b26018 Debug 4.0 2016-05-17 19:32:19 +02:00
Laurent Destailleur
e2d3f4e27d Supplier proposal was missing 2016-05-17 19:15:44 +02:00
Laurent Destailleur
d083ad9382 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/product/class/product.class.php
	htdocs/resource/class/html.formresource.class.php
 2016-05-17 18:21:22 +02:00
Laurent Destailleur
79be93d998 FIX The table llx_product_lot is now filled/used to store eatby/sellby 
dates.
 2016-05-17 18:19:36 +02:00
Laurent Destailleur
0e040b166d Fix: When we edit a product to use lot/serial number, we initialize 
records for unknown lots to generic value 'Undefined'.
 2016-05-17 17:55:41 +02:00
Laurent Destailleur
3b99fb01ee Fix duplicate table 2016-05-17 10:51:03 +02:00
Laurent Destailleur
f9ded46a99 Start debug 4.0 2016-05-17 02:41:06 +02:00
Laurent Destailleur
901c7c9517 Link "Backtolist" was missing on products 2016-05-17 02:16:28 +02:00
Laurent Destailleur
1973f67d41 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-05-17 01:11:14 +02:00
Laurent Destailleur
95ea20eb44 Clean code for stock movement when lot are used. We should not get 
duplicate records into llx_product_batch
 2016-05-17 01:10:11 +02:00
Laurent Destailleur
20a2e9394d Fix typo comment 2016-05-16 22:44:11 +02:00