Laurent Destailleur
321933f267
Fix deletion of product
2016-12-18 02:10:26 +01:00
Maxime Kohlhaas
97e21cb775
Fix : delete product was not possible if batch stock
2016-12-10 13:05:46 +01:00
Laurent Destailleur
2a19326a3f
FIX Missing database escaping on supplier price insert/update
2016-03-31 21:47:32 +02:00
gauthier
756b50b9d3
FIX : search product in customer product prices doesn't work
2016-02-12 12:06:23 +01:00
Laurent Destailleur
dfd4d36bdf
Merge remote-tracking branch 'origin/3.7' into 3.8
2016-01-30 15:58:11 +01:00
Laurent Destailleur
c9661ee20e
Merge remote-tracking branch 'origin/3.6' into 3.7
2016-01-30 15:57:09 +01:00
Marcos García de La Fuente
83263e242e
Corrected typo of PR #4444
2016-01-23 20:32:22 +01:00
Laurent Destailleur
dc438792f4
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/fourn/commande/card.php
2016-01-23 11:39:37 +01:00
Laurent Destailleur
9be246baa5
Merge remote-tracking branch 'origin/3.6' into 3.7
2016-01-23 11:32:06 +01:00
Marcos García de La Fuente
da637db162
FIX #4440 Wrong price is filled by Product::fetch into multiprices arrays
2016-01-18 10:17:59 +01:00
Laurent Destailleur
7e03aaee23
Merge remote-tracking branch 'origin/3.7' into 3.8
2015-12-21 12:25:47 +01:00
Laurent Destailleur
96b6f0d8fb
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
composer.json
htdocs/product/ajax/products.php
htdocs/product/class/product.class.php
2015-12-21 12:24:24 +01:00
Laurent Destailleur
9334cf8fd1
FIX #4243 sql injection
2015-12-19 18:03:08 +01:00
Laurent Destailleur
e37fc87cd5
Merge remote-tracking branch 'origin/3.7' into 3.8
2015-12-13 17:34:06 +01:00
Laurent Destailleur
1978eebb69
Fix bad merge
2015-12-13 17:33:20 +01:00
Laurent Destailleur
a462cd232d
Merge remote-tracking branch 'origin/3.7' into 3.8
2015-12-13 16:09:09 +01:00
Laurent Destailleur
4a88c9ea9f
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/product/class/product.class.php
2015-12-13 15:53:57 +01:00
fmarcet
eb98bd1e78
FIX: Not delete a product when have customer price
2015-12-03 14:02:26 +01:00
ricardomm
eb504ffacc
minor fix accessing $db
2015-12-02 11:53:23 +01:00
Laurent Destailleur
f928062e2b
FIX #3726 Better support for PRODUCT_USE_OLD_PATH_FOR_PHOTO
2015-11-02 17:56:32 +01:00
fmarcet
310ecb1e09
FIX: Show product image on getNomUrl()
2015-10-29 12:28:28 +01:00
Raphaël Doursenaud
6c2b46f939
Fix #3728 Properly remove last category
2015-10-15 10:15:37 +02:00
Raphaël Doursenaud
f0466ba313
FIX #3607 Better categories setting and unsetting
...
This allows triggering CATEGORY_LINK and CATEGORY_UNLINK each time.
2015-09-30 18:47:02 +02:00
Laurent Destailleur
3ee5920947
Merge pull request #3571 from fmarcet/3.8
...
FIX: When filter with empty status, by default get canceled status (-1)
2015-09-24 18:40:06 +02:00
Florian HENRY
84fa92045c
FIX : avoid SQL error when no sortfield send to method
2015-09-23 12:10:38 +02:00
fmarcet
3ff8b3e437
FIX: Error retrieving customer prices
2015-09-23 10:23:29 +02:00
Laurent Destailleur
db1d9d6d8e
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/fourn/commande/dispatch.php
2015-09-12 11:50:46 +02:00
Laurent Destailleur
0c3ebe63c2
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/product/class/html.formproduct.class.php
htdocs/product/stock/index.php
htdocs/product/stock/liste.php
htdocs/product/stock/mouvement.php
htdocs/product/stock/product.php
htdocs/product/stock/valo.php
2015-09-12 11:44:07 +02:00
Laurent Destailleur
36632593c0
Fix SQL injections #3300
2015-09-12 11:36:19 +02:00
Maxime Kohlhaas
c6081f0fa2
Fix multientity stock management (F.Henry followup)
2015-09-11 20:38:32 +02:00
Florian HENRY
89b723b2a7
FIX : multientity warehouse management
2015-09-08 16:23:00 +02:00
Florian HENRY
52cb9581ff
Fix multientity stock management
2015-09-08 16:00:13 +02:00
Laurent Destailleur
3bdd342df1
Fix #3116
2015-08-14 23:53:59 +02:00
aspangaro
59e88590e0
Move my address email to new one
2015-07-15 20:30:33 +02:00
Laurent Destailleur
a9289de616
Several fixes. Fix #2927
2015-07-13 11:22:18 +02:00
Laurent Destailleur
11c94a9d3b
Clean code
2015-07-12 16:50:27 +02:00
Laurent Destailleur
276f057acf
Clean trigger codes
...
Better error message when we insert duplicate barcode.
2015-06-30 16:10:03 +02:00
Laurent Destailleur
dc050d39eb
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/adherents/type.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
htdocs/core/js/lib_batch.js
htdocs/core/modules/modUser.class.php
htdocs/fichinter/card.php
htdocs/fourn/commande/card.php
htdocs/societe/consumption.php
htdocs/user/info.php
htdocs/user/note.php
htdocs/user/param_ihm.php
htdocs/user/perms.php
2015-06-29 00:09:28 +02:00
Laurent Destailleur
b5cc7ae1c8
Work on merge tab photos and attached files
2015-06-19 00:52:58 +02:00
Regis Houssin
9c6c3ad65d
Fix: wrong user right
2015-06-17 16:33:18 +02:00
Laurent Destailleur
34468644ef
Merge remote-tracking branch 'origin/3.5' into 3.6
2015-06-16 11:15:16 +02:00
Regis Houssin
5e25c69891
Fix: thumb "mini" not deleted
2015-06-16 09:28:31 +02:00
Marcos García de La Fuente
1215502927
Fix Close bug #2814 JPEG photos are not displayed in Product photos page
2015-06-13 03:11:17 +02:00
Laurent Destailleur
df60754e52
Merge pull request #2708 from GPCsolutions/deprecated
...
Deprecated
2015-06-05 15:44:08 +02:00
Laurent Destailleur
a33241f487
Maxi debug of 3.8. Nearly ready for freeze.
2015-06-05 14:46:30 +02:00
Raphaël Doursenaud
3f9270ea78
Qual: added deprecation hinting
...
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
2015-06-01 11:00:11 +02:00
Laurent Destailleur
a258370f8a
Prepare code for generic solution where all path are forged using
...
get_exdir.
2015-05-18 22:25:51 +02:00
Francis Appels
28e973331b
Fix: update supplier orderline + rm deprecated prop
...
- Fix SQL error in update supplier orderline
- Remove deprecated $libelle from product class, $libelle is removed
from code and can not be used anymore, no sense to mark deprecated.
- Add missing translation key
2015-05-18 18:42:14 +02:00
Florian HENRY
4bc2d55cb3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-05-15 17:37:31 +02:00
Laurent Destailleur
bf883e1576
Minor cosmetic changes
...
Fix permissions and CRLF
2015-05-15 02:34:57 +02:00
