Laurent Destailleur
|
80581b2908
|
Merge pull request #1978 from atm-maxime/3.6
Fix : product list was wrong on supplier invoice because fourn_id is not fetched
|
2014-10-30 17:56:22 +01:00 |
|
MAxime Kohlhaas
|
374b761fdf
|
Fix : product list was wrong on supplier invoice because fourn_id is not fetched
|
2014-10-25 19:20:02 +02:00 |
|
Laurent Destailleur
|
9768550696
|
Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
ChangeLog
htdocs/categories/fiche.php
htdocs/comm/action/index.php
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/fourn/fiche.php
htdocs/product/composition/fiche.php
htdocs/product/price.php
htdocs/projet/tasks/task.php
htdocs/projet/tasks/time.php
|
2014-10-12 02:54:34 +02:00 |
|
Maxime Kohlhaas
|
4fd67d725a
|
Fix bug 1588 : relative discount not working anymore
|
2014-10-09 13:58:43 +02:00 |
|
Laurent Destailleur
|
dec7fe42af
|
Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/fourn/commande/fiche.php
|
2014-07-20 15:37:50 +02:00 |
|
Laurent Destailleur
|
a9779ca1ff
|
Fix: bad colspan for line with date selector
|
2014-07-20 02:18:21 +02:00 |
|
Laurent Destailleur
|
04a20d2008
|
- New: Enable feature developed for 3.6 we forgot to enabled: Adding
prefix on uploaded file names.
- New: No more dependency between contract and service module.
|
2014-07-19 22:05:35 +02:00 |
|
Laurent Destailleur
|
b42a33b203
|
Fix: For contract, only services available by default. Product appears
if option is set only.
|
2014-07-19 21:14:56 +02:00 |
|
Raphaël Doursenaud
|
55d062784d
|
Added labels on objectline form elements
|
2014-07-11 13:25:44 +02:00 |
|
Florian HENRY
|
b8c293fb16
|
$dateSelector is a paramters of formAddObjectLine, if use global it is
reset to 0 because not declare in outer context but already exists in
the same context.
|
2014-07-04 14:48:27 +02:00 |
|
Laurent Destailleur
|
8d8ca154f1
|
Fix: For supplier order/invoice, deselect product when free line is
selected.
|
2014-06-09 14:58:58 +02:00 |
|
Laurent Destailleur
|
5fa05ee29d
|
Start to clean code of templates to input lines
|
2014-05-12 12:53:10 +02:00 |
|
Laurent Destailleur
|
3776f7b146
|
Fix: margin calculation from % when we enter a free product.
|
2014-05-10 20:10:59 +02:00 |
|
Laurent Destailleur
|
01001592e6
|
Finished task to merge form of free product and predefined product.
|
2014-05-06 18:31:39 +02:00 |
|
Laurent Destailleur
|
dca53accaf
|
Fix: translation
|
2014-05-05 18:30:07 +02:00 |
|
Laurent Destailleur
|
131f133e07
|
New: Merge free product and predefined product area to enter new
product (Supplier orders now use same template than customer
orders/proposal/invoices).
|
2014-05-05 17:59:43 +02:00 |
|
Laurent Destailleur
|
d224128c46
|
New: Merge free product and predefined product area to enter new
product.
|
2014-05-05 14:30:08 +02:00 |
|