Laurent Destailleur
|
fb625f0ca7
|
FIX #4812
|
2016-03-18 13:58:06 +01:00 |
|
Laurent Destailleur
|
7fa71214bc
|
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
htdocs/core/modules/commande/doc/pdf_proforma.modules.php
|
2016-03-18 11:06:41 +01:00 |
|
Laurent Destailleur
|
e5f0027dbf
|
Merge pull request #4823 from ndrosis/3.9
FIX SQL syntax error in export
|
2016-03-17 23:37:23 +01:00 |
|
Laurent Destailleur
|
22f6e0e92d
|
Merge pull request #4831 from fmarcet/3.9
FIX: Not showing sellprice properly on product list
|
2016-03-17 23:33:05 +01:00 |
|
Alexis Algoud
|
19e3c1b089
|
FIX finished parameters not used
|
2016-03-17 16:35:23 +01:00 |
|
philippe grand
|
d434cee3fa
|
[Qual] Typo
|
2016-03-17 09:40:05 +01:00 |
|
fmarcet
|
a1bc5dcc31
|
FIX: Not showing sellprice properly on product list
|
2016-03-16 16:35:07 +01:00 |
|
fmarcet
|
ad942afbf1
|
FIX: Not showing sellprice properly on product list
|
2016-03-16 16:30:59 +01:00 |
|
Drosis Nikos
|
610249068d
|
Fix syntax
SQL error when ordering product list
|
2016-03-15 12:48:46 +02:00 |
|
Laurent Destailleur
|
3b035819a9
|
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php
htdocs/product/document.php
htdocs/societe/commerciaux.php
|
2016-03-10 15:03:53 +01:00 |
|
Laurent Destailleur
|
d6f3a5c046
|
Fix bad path
|
2016-03-10 15:01:39 +01:00 |
|
Marcos García de La Fuente
|
d43d0bfec1
|
Fixes a little problem with multiprice rules, now undefined ones evaluate to 0% variation
|
2016-03-08 12:16:32 +01:00 |
|
Florian HENRY
|
a8e2b49c5b
|
FIX : #4768
|
2016-03-08 10:22:31 +01:00 |
|
Laurent Destailleur
|
3b70bbb05a
|
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/core/lib/admin.lib.php
|
2016-03-02 23:07:42 +01:00 |
|
Marcos García de La Fuente
|
aa45734683
|
FIX #4434 Weird behaviour when enabling multiprices
Close #4434
|
2016-03-02 11:38:40 +01:00 |
|
Laurent Destailleur
|
8807222f24
|
Fix a lot of fixes to have the french vat npr working better
|
2016-02-27 12:22:39 +01:00 |
|
Laurent Destailleur
|
c1d7f5a7ed
|
FIX #4633
|
2016-02-21 20:00:40 +01:00 |
|
Laurent Destailleur
|
a2817049c9
|
Fix must show warning only if threshold defined.
|
2016-02-20 03:34:56 +01:00 |
|
Laurent Destailleur
|
3864bd35c9
|
Fix NPR Vat is working correctly with multiprice too
|
2016-02-19 03:59:43 +01:00 |
|
Laurent Destailleur
|
4d0b9946f5
|
FIX Maxi serious problem when updating prices and vat of a product. All
mode (one price, price per level, ...) were impacted. Localtax setup
were lost.
|
2016-02-19 02:41:00 +01:00 |
|
Laurent Destailleur
|
52c82508e4
|
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/compta/charges/index.php
|
2016-02-18 23:27:57 +01:00 |
|
Laurent Destailleur
|
b0b2668428
|
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
|
2016-02-18 23:21:22 +01:00 |
|
Laurent Destailleur
|
bc4c964b89
|
Several fixes in stock management (label, and bad action when lot module
is on)
|
2016-02-18 23:21:02 +01:00 |
|
Raphaël Doursenaud
|
dfe7c6f06f
|
Fix #4649 Wrong parameters order
|
2016-02-18 12:21:11 +01:00 |
|
Laurent Destailleur
|
633de3bcb4
|
Fix list of object referers should not be set to invoice by default (may
be module is disabed). I replace with a message to choose list.
|
2016-02-17 22:33:02 +01:00 |
|
Laurent Destailleur
|
3bcc7b0f8f
|
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/comm/remise.php
htdocs/expedition/card.php
htdocs/expedition/class/expedition.class.php
htdocs/filefunc.inc.php
htdocs/societe/price.php
|
2016-02-15 01:37:23 +01:00 |
|
Laurent Destailleur
|
b7ae5bac6f
|
Fix: The text "All" is not appropriate.
|
2016-02-14 20:48:25 +01:00 |
|
gauthier
|
756b50b9d3
|
FIX : search product in customer product prices doesn't work
|
2016-02-12 12:06:23 +01:00 |
|
Sof
|
19b333f78b
|
FIX : Typo
|
2016-02-08 14:48:05 +01:00 |
|
Laurent Destailleur
|
062deae24c
|
Merge
|
2016-02-05 12:18:50 +01:00 |
|
Francis Appels
|
5f7cb75518
|
Fix #4556 desiredstock and seuil_stock_alerte cleared on modify product card
removed inputs from update form also removed from update action
|
2016-02-03 19:52:09 +01:00 |
|
Laurent Destailleur
|
165771b652
|
FIX #4439
|
2016-02-03 01:46:30 +01:00 |
|
Laurent Destailleur
|
bbf15d6a5d
|
FIX #4498
|
2016-02-03 01:20:06 +01:00 |
|
Laurent Destailleur
|
5e9fd25a6e
|
Merge remote-tracking branch 'origin/3.8' into 3.9
|
2016-01-30 15:59:40 +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 |
|
Laurent Destailleur
|
6e69e99227
|
FIX VAT Rate was not visible in log of old price list
|
2016-01-30 15:34:06 +01:00 |
|
fmarcet
|
e3d8a9a8a4
|
FIX: Doesn't collect the value of the cost price correctly
|
2016-01-27 12:13:31 +01:00 |
|
fmarcet
|
eec8d30625
|
FIX: Not returning the correct multilevel price
|
2016-01-27 10:57:04 +01:00 |
|
Marcos García de La Fuente
|
83263e242e
|
Corrected typo of PR #4444
|
2016-01-23 20:32:22 +01:00 |
|
Laurent Destailleur
|
dbaa43f3be
|
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/fourn/commande/card.php
htdocs/holiday/card.php
htdocs/holiday/list.php
htdocs/user/card.php
|
2016-01-23 11:45:39 +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
|
7b4ebb498e
|
Merge pull request #4415 from fappels/3.9-4409
Fix #4409 totals not shown in stock/list
|
2016-01-14 11:07:47 +01:00 |
|
fappels
|
f150676908
|
Fix #4409 totals not shown in stock/list
|
2016-01-13 16:33:51 +01:00 |
|
Laurent Destailleur
|
d7fdcc83bb
|
Fix missing search criteria
|
2016-01-12 22:03:19 +01:00 |
|
Laurent Destailleur
|
37c106acff
|
Fix search on shipment
|
2016-01-08 23:59:02 +01:00 |
|
Laurent Destailleur
|
99f3870ee6
|
Fix no picot if no warehouse set
Fix search on warehouse
|
2016-01-08 23:54:40 +01:00 |
|
Laurent Destailleur
|
96e5651ed5
|
Fix missing field on list. Restor ability to search on supplier ref.
|
2016-01-03 14:38:47 +01:00 |
|