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
Alexis Algoud
24ae5a0ca6
FIX virtual stock for virtual product
2015-07-24 11:37:15 +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
Laurent Destailleur
74607218ea
Fight against key tva_taux. Removed completely.
2015-05-14 15:59:09 +02:00
Florian HENRY
8e61a03b5c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-05-12 21:02:36 +02:00
Laurent Destailleur
cb6f23d9b6
Merge pull request #2771 from aternatik/api_rest
...
Add new core module : REST API
2015-05-12 19:39:37 +02:00
Laurent Destailleur
b2fa603f46
Merge pull request #2794 from hregis/develop_origin
...
Fix: add $object for use with triggers
2015-05-11 23:02:41 +02:00
Marcos García de La Fuente
f6616deef3
Removed debugging function
2015-05-10 01:28:40 +02:00
Marcos García de La Fuente
f8e8b39ff2
FIX #2758 Product::update sets product note to "null" when $prod->note is null
2015-05-10 01:27:28 +02:00
Raphaël Doursenaud
5d2f081152
[Qual] Fixed HTML select form selected attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The select form selected attribute should not have a value.
2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
b8d9c20731
[Qual] Fixed HTML input form disabled attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form disabled attribute should not have a value.
2015-05-07 14:21:14 +02:00
Laurent Destailleur
a93ba86ce0
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/expedition/modules_expedition.php
htdocs/core/modules/modContrat.class.php
htdocs/expedition/class/expedition.class.php
2015-05-07 13:35:09 +02:00
Regis Houssin
5578151bad
Fix: add $object for use with triggers
2015-05-07 12:08:02 +02:00
Regis Houssin
85244ba8c9
Fix: add $object for use with triggers
2015-05-07 12:06:17 +02:00
Regis Houssin
9a32d7ec2f
Fix: add $object for use with triggers
2015-05-07 12:02:24 +02:00
Laurent Destailleur
f197a94f59
Fix duplicate log
2015-05-07 10:52:41 +02:00
Laurent Destailleur
b71e5a1025
Merge pull request #2673 from aternatik/fix_getentity
...
Fix : missing getEntity calls
2015-05-07 00:48:19 +02:00
jfefe
24bf614061
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into api_rest
...
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-05-06 01:00:11 +02:00
jfefe
dbb9449ee7
Fix PHPCS
2015-05-06 00:55:42 +02:00
jfefe
561d5e82c1
Rename libelle product field into label
2015-05-04 12:33:38 +02:00
jfefe
7e0357dcf9
FIX : remove deprecated property 'libelle' on product object
2015-05-04 03:03:24 +02:00
jfefe
cd37d3eb11
Add API class for product
2015-05-04 01:17:41 +02:00
Laurent Destailleur
333a29683c
uniformize look
2015-05-03 21:15:08 +02:00
fmarcet
1c01e187c1
Fix: Bug in the new photo system
2015-04-27 17:20:10 +02:00
fmarcet
99c4508029
Fix: Bug in the new photo system
2015-04-27 16:44:12 +02:00
Laurent Destailleur
5b3b180c10
NEW Web service to create or update product can correct stock during
...
creation/update.
2015-04-27 01:36:13 +02:00
Frédéric FRANCE
768fdde2d1
Update product.class.php
2015-04-22 10:39:32 +02:00
Laurent Destailleur
96a33bbe8a
First clean of code after devcamp
2015-04-21 15:49:58 +02:00
Marcos García de La Fuente
2967bc7df7
Merge branch 'develop' into units
2015-04-19 17:19:59 +02:00
Florian HENRY
72c92557de
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/product/class/propalmergepdfproduct.class.php
2015-04-19 13:06:59 +02:00
Florian HENRY
37bc7c3f1d
typo
2015-04-19 13:05:40 +02:00