Laurent Destailleur
|
3295498e9e
|
Remove code comment
|
2017-09-16 12:50:34 +02:00 |
|
Laurent Destailleur
|
d0e3d9db76
|
Merge pull request #4992 from altatof/fix_minimum_buying_price
FIX: correct display of minimum buying price
|
2016-04-11 19:17:09 +02:00 |
|
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
|
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
|
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
|
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
|
1978eebb69
|
Fix bad merge
|
2015-12-13 17:33:20 +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 |
|
Laurent Destailleur
|
7105fabb79
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/langs/en_US/users.lang
htdocs/product/stock/class/mouvementstock.class.php
|
2015-12-03 12:51:49 +01:00 |
|
Marcos García de La Fuente
|
9f27e2323f
|
FIX #3734 Do not show empty links of deleted source objects in stock movement list
|
2015-11-21 11:51:23 +01:00 |
|
Laurent Destailleur
|
fe78996026
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/product/stock/fiche.php
htdocs/product/stock/valo.php
|
2015-11-05 22:04:18 +01:00 |
|
Christophe Battarel
|
f566b38296
|
FIX pmp
|
2015-11-05 15:29:51 +01:00 |
|
Christophe Battarel
|
fa088eb6cc
|
FIX bad calculation for stock value
|
2015-11-05 14:57:58 +01:00 |
|
Maxime Kohlhaas
|
c46f9350a5
|
Fix : stats were wrong if same product on several lines with same quantity because of distinct
|
2015-10-30 09:50:04 +01: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 |
|