Christophe Battarel
|
292373cf84
|
forgot new discount field
|
2016-04-11 17:43:10 +02:00 |
|
Christophe Battarel
|
983b2c9a21
|
FIX: real min buying price
|
2016-04-11 17:40:47 +02:00 |
|
Laurent Destailleur
|
9b85a70013
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
|
2015-10-16 09:52:38 +02:00 |
|
Alexis Algoud
|
0251728e28
|
FIX double db escape add too quote
|
2015-10-12 17:36:24 +02:00 |
|
Laurent Destailleur
|
3f8e9bd181
|
Remove warning
|
2015-10-10 19:24:31 +02:00 |
|
philippe grand
|
0e343ae3b2
|
syntax error
|
2015-10-08 09:34:02 +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 |
|
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
|
63a817c3a4
|
Fix wahrehouse multientty management
|
2015-09-08 16:13:15 +02:00 |
|
Florian HENRY
|
52cb9581ff
|
Fix multientity stock management
|
2015-09-08 16:00:13 +02:00 |
|
Regis Houssin
|
1a08f65942
|
Fix: problem with pagination
|
2015-09-02 17:22:19 +02:00 |
|
Regis Houssin
|
fdf6c32fbc
|
Fix: place the form outside the table for avoid errors
|
2015-08-13 12:47:04 +02:00 |
|
Laurent Destailleur
|
2bb1945a2f
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/compta/prelevement/class/rejetprelevement.class.php
htdocs/compta/sociales/class/paymentsocialcontribution.class.php
htdocs/contact/exportimport.php
htdocs/contact/ldap.php
htdocs/contact/perso.php
htdocs/contact/vcard.php
htdocs/core/class/commonobject.class.php
htdocs/product/reassort.php
htdocs/projet/liste.php
htdocs/societe/consumption.php
htdocs/societe/info.php
|
2015-07-19 12:04:30 +02:00 |
|
phf
|
582f9cd214
|
FIX : keep filter by category or by not enough stock if we switch page
|
2015-06-26 11:04:08 +02:00 |
|
Regis Houssin
|
9c6c3ad65d
|
Fix: wrong user right
|
2015-06-17 16:33:18 +02:00 |
|
Laurent Destailleur
|
ceb0d71f54
|
Merge pull request #3054 from hregis/3.7_photos
Fix: thumb "mini" not deleted
|
2015-06-16 11:38:39 +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
|
2d3ab3b658
|
Merge remote-tracking branch 'upstream/3.5' into bug-2814-2
Conflicts:
ChangeLog
|
2015-06-15 09:39:17 +02:00 |
|
Laurent Destailleur
|
a7cec18081
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/categories/fiche.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/install/upgrade2.php
htdocs/product/liste.php
|
2015-06-14 17:11:36 +02:00 |
|
Laurent Destailleur
|
f4da53c300
|
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/product/liste.php
htdocs/product/price.php
|
2015-06-14 17:04:24 +02:00 |
|
Laurent Destailleur
|
fadc640335
|
Merge branch 'bug-2835' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-2835
Conflicts:
ChangeLog
|
2015-06-14 16:07:19 +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 |
|
Juanjo Menent
|
567dece678
|
Merge pull request #3011 from GPCsolutions/3.7-3009
FIX #3009: Better filtering to prevent SQL injection
|
2015-06-12 21:26:14 +02:00 |
|
Marcos García de La Fuente
|
f9574fa458
|
FIX Close #2835 Customer prices of a product shows incorrect history order
|
2015-06-12 19:05:08 +02:00 |
|
Marcos García de La Fuente
|
2051a66cd7
|
FIX Close #2837 Product list table column header does not match column body
|
2015-06-12 18:46:05 +02:00 |
|
fmarcet
|
5783c185bd
|
Fix: Not reading external barcode numeration module
|
2015-06-11 10:43:12 +02:00 |
|
Raphaël Doursenaud
|
4ee6c1810e
|
FIX #3009: Better filtering to prevent SQL injection
|
2015-06-11 10:38:29 +02:00 |
|
Raphaël Doursenaud
|
d89955047b
|
FIX #3009: Better filtering to prevent SQL injection
|
2015-06-11 10:37:30 +02:00 |
|
phf
|
a676d3a0d1
|
Merge branch '3.6' into 3.7
|
2015-05-27 10:56:16 +02:00 |
|
phf
|
5a006d824e
|
FIX : top links menu have target attribute with wrong value
|
2015-05-27 10:52:23 +02:00 |
|
Laurent Destailleur
|
11d4a945b0
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/adherents/liste.php
htdocs/comm/propal.php
htdocs/compta/facture.php
htdocs/contact/list.php
htdocs/contrat/liste.php
htdocs/product/liste.php
|
2015-05-25 18:08:23 +02:00 |
|
Laurent Destailleur
|
a33809a526
|
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/adherents/liste.php
htdocs/comm/propal.php
htdocs/compta/facture.php
|
2015-05-25 17:46:42 +02:00 |
|
maxime peyrot
|
bcb4754585
|
FIX #2856 : Wrong table design
|
2015-05-21 17:40:36 +02:00 |
|
Raphaël Doursenaud
|
a7f6bbd316
|
Properly escape untrusted data to prevent HTML injection.
First pass for #2857
|
2015-05-20 17:34:00 +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 |
|
Regis Houssin
|
5578151bad
|
Fix: add $object for use with triggers
|
2015-05-07 12:08:02 +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
|
9b55bedf66
|
FIX bad calculation for stock value
|
2015-05-04 22:04:58 +02:00 |
|
fmarcet
|
99c4508029
|
Fix: Bug in the new photo system
|
2015-04-27 16:44:12 +02:00 |
|
Francis Appels
|
93d9321088
|
FIX: can show print page after product save
Add product id to form action to be able show print page from product
card after save.
|
2015-04-22 23:27:09 +02:00 |
|
Juanjo Menent
|
d7ba9b3312
|
Fix: Bad permission assignments for stock movements actions
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/product/stock/mouvement.php
|
2015-04-07 20:40:48 +02:00 |
|
Juanjo Menent
|
9d8cb459f1
|
Fix: Bad permission assignments for stock movements actions
|
2015-04-07 20:28:45 +02:00 |
|
Laurent Destailleur
|
3cc4358e72
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
build/makepack-dolibarr.pl
htdocs/commande/liste.php
htdocs/product/stock/product.php
|
2015-03-29 15:24:17 +02:00 |
|
Maxime Kohlhaas
|
b250c5588e
|
Fix : Quantity displayed for virtual stock explanations was wrong
|
2015-03-25 16:11:36 +01:00 |
|
Laurent Destailleur
|
5d2e09ec51
|
Fix: navigation in page was wrong and typo errors.
|
2015-03-23 12:31:32 +01:00 |
|
Laurent Destailleur
|
4f9aef6150
|
Fix calculation of PMP of product.
Also add phpunit test to avoid this in future.
|
2015-03-21 15:29:23 +01:00 |
|