Laurent Destailleur
1c7feb67ea
Merge branch 'dinamic-prices-product' of
...
https://github.com/IonAgorria/dolibarr into
IonAgorria-dinamic-prices-product
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/fournisseurs.php
2015-01-31 14:53:14 +01:00
Laurent Destailleur
275e198041
New: Selection of project use the new select2 component.
2015-01-30 19:57:38 +01:00
Laurent Destailleur
59711298c3
Fixed: Length of project label is no more truncated on element cards
...
(invoice, proposal, order...)
2015-01-30 16:33:39 +01:00
Frédéric FRANCE
f3a3136452
Update html.form.class.php
2015-01-18 11:38:45 +01:00
Laurent Destailleur
eeeb6de8d9
Merge pull request #2020 from GPCsolutions/situationsinvoices
...
Situations invoices support
2015-01-17 14:44:05 +01:00
Laurent Destailleur
fc78d632d3
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/company.lib.php
htdocs/core/lib/functions.lib.php
htdocs/main.inc.php
2015-01-09 23:09:10 +01:00
Raphaël Doursenaud
50c2b75ef8
Invoices: added situation (or interim) invoices support
2015-01-06 17:12:13 +01:00
Marcos García de La Fuente
86100758ff
Miscellaneous corrections
2014-12-28 20:13:15 +01:00
Ion Agorria
5bbcb58b44
Added expressions for product/service prices
2014-12-28 01:26:41 +01:00
Frédéric FRANCE
dc18759c6c
Attribut width not allowed with div or span
2014-12-27 11:15:26 +01:00
Laurent Destailleur
d8557d8af0
Fixed: label
2014-12-26 05:16:00 +01:00
Laurent Destailleur
5ead994955
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
2014-12-26 04:57:55 +01:00
Marcos García de La Fuente
eb524cfd29
Copyright info
2014-12-25 22:50:33 +01:00
Marcos García de La Fuente
7b6a4d1bfd
Fix: [ bug #1715 ] Valign and width attributes are used in div tags
2014-12-25 22:50:15 +01:00
Laurent Destailleur
2a3bb96c34
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/ecm.lib.php
2014-12-22 03:14:22 +01:00
Laurent Destailleur
31f782ffe9
Fix: Several fixes into tasks and time spent management
2014-12-21 14:58:18 +01:00
Laurent Destailleur
268723be7b
Fixed: sql syntax error
2014-12-21 01:39:20 +01:00
Laurent Destailleur
cea500ef80
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/ajax.lib.php
2014-12-20 13:06:08 +01:00
Laurent Destailleur
c9f3267649
Fixed: bad conditions
2014-12-20 11:34:37 +01:00
Laurent Destailleur
27f26bba27
Fixed: Missing test
2014-12-20 11:17:04 +01:00
Laurent Destailleur
854ed90a62
Fixed: bad place for the ajaxcombo.
2014-12-20 11:15:10 +01:00
Laurent Destailleur
4769e26d8e
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
2014-12-18 12:34:41 +01:00
Laurent Destailleur
a8c6417604
Merge remote-tracking branch 'origin/3.7' into develop
2014-12-15 10:33:14 +01:00
Laurent Destailleur
0b6ff8f9bc
Fix: Debug of feature PRODUIT_CUSTOMER_PRICES_BY_QTY. Dev seems to not
...
be finished. We keep it as development status.
2014-12-14 20:41:11 +01:00
Laurent Destailleur
711b033844
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/class/html.form.class.php
htdocs/product/stock/card.php
2014-12-14 12:35:13 +01:00
Laurent Destailleur
b7c476d339
Merge pull request #2139 from frederic34/patch-3
...
Use same size for select_produits_fournisseur and select_produits
2014-12-10 11:30:57 +01:00
Laurent Destailleur
7834a9b099
Add hidden constant to solve bug of too low size to see products label.
2014-12-10 00:51:57 +01:00
Frédéric FRANCE
9f1ec0e710
Update html.form.class.php
2014-12-09 20:52:55 +01:00
Frédéric FRANCE
6a01b6982e
Update html.form.class.php
2014-12-09 20:20:52 +01:00
Frédéric FRANCE
34b42ba798
Truncate label different for small or big screen
2014-12-09 18:47:12 +01:00
Frédéric FRANCE
8cae2f1448
Use same size for select_produits_fournisseur and select_produits
2014-12-09 16:21:44 +01:00
Laurent Destailleur
ff23b0c0a6
Fix: No print
2014-12-07 12:10:50 +01:00
Laurent Destailleur
ceba894d57
Start to work on new generation combo box.
2014-12-05 13:26:47 +01:00
Laurent Destailleur
1e8e4e7fda
Prepare 3.8 dev
...
Fix bad test.
Renamed table for dynamic prices.
2014-12-03 17:06:44 +01:00
Laurent Destailleur
1653384415
Merge branch 'dinamic-prices' of github.com:IonAgorria/dolibarr into IonAgorria-dinamic-prices
2014-12-03 13:14:35 +01:00
Frédéric FRANCE
dd18c980fc
Update html.form.class.php
2014-11-30 22:00:16 +01:00
Ion Agorria
fac46b3b46
Code for dinamic prices funcionality
2014-11-29 06:31:35 +01:00
Laurent Destailleur
6843bfcc15
Fix typo
2014-11-28 00:01:59 +01:00
Laurent Destailleur
b644075faa
Fix: doxygen
2014-11-20 23:41:58 +01:00
Laurent Destailleur
f7a74a9ac9
Fix: CRLF
2014-11-20 16:16:15 +01:00
Laurent Destailleur
95de38e102
Start to fix [ bug #1711 ] Projet cloturé toujours visible dans les
...
autres module pour affectation but it is a too important change.
2014-11-20 15:32:10 +01:00
Laurent Destailleur
d4ad7236e5
Clean old code for multiselect (replaced with select2 plugin).
2014-11-16 00:46:27 +01:00
Laurent Destailleur
a46a6cccaf
Fix: Screen page tests. Page tests are now ok with 3.7.
2014-11-15 00:57:31 +01:00
Laurent Destailleur
6bac744709
Fix: Missing event management into select when combo not selected
2014-11-13 16:46:40 +01:00
Laurent Destailleur
5c2862dae3
Merge pull request #1976 from frederic34/patch-2
...
Add a little delay in ajax_autocompleter
2014-11-04 17:41:23 +01:00
Laurent Destailleur
0b41df7c35
Clean code to manage multiselect jquery: All code is centralized
...
into function multipleselectarray (except loading of css).
Code is prepared to choose which plugin to use (only a if is required
to switch or add a new manager). Introduce working version with
multiple-select jquery plugin. Removed deprecated old jquery plugin.
2014-11-04 00:33:50 +01:00
Laurent Destailleur
b6b6cced30
Fix: Test sur user assigned not filled
...
Can use empty line into select boolean form.
2014-11-03 20:02:11 +01:00
Frédéric FRANCE
f18e513046
Update html.form.class.php
2014-10-30 18:44:56 +01:00
Laurent Destailleur
750944d718
Fix: var not initialised
2014-10-30 11:16:01 +01:00
Laurent Destailleur
3fe4c58e95
Use span class="badge" for notes.
2014-10-19 19:57:42 +02:00
