Laurent Destailleur
|
4bf0e31299
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/loan.lang
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
|
2017-03-11 02:40:42 +01:00 |
|
Laurent Destailleur
|
47dd53abbe
|
NEW The substitution keys available for emailing edition is now into a
popup
|
2017-03-11 02:36:22 +01:00 |
|
Laurent Destailleur
|
2a3d3b4b50
|
Fix dol_banner for agenda
|
2017-03-10 16:40:38 +01:00 |
|
Laurent Destailleur
|
a9b39f3028
|
Fix dol_banner for agenda
|
2017-03-10 16:27:28 +01:00 |
|
Laurent Destailleur
|
57c2971175
|
Fix dol_banner for agenda
|
2017-03-10 16:19:18 +01:00 |
|
Laurent Destailleur
|
fb88eaf2a4
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
|
2017-02-23 02:55:50 +01:00 |
|
Laurent Destailleur
|
ba03b17354
|
Fix css
|
2017-02-22 14:30:39 +01:00 |
|
Laurent Destailleur
|
3f3b82ed64
|
Merge pull request #6454 from atm-florian/dev_fix_unittrad
fix unit trad
|
2017-02-22 14:16:28 +01:00 |
|
Laurent Destailleur
|
1681445427
|
Remove useless line
|
2017-02-22 00:08:25 +01:00 |
|
florian HENRY
|
c8de648924
|
fix unit trad
|
2017-02-21 19:07:57 +01:00 |
|
De Coninck Laurent
|
33d1d78329
|
FIX - use MAIN_FIRSTNAME_NAME_POSITION for select users
|
2017-02-21 09:22:50 +01:00 |
|
Laurent Destailleur
|
fd111cb1c6
|
NEW tooltip can be on hover or on click with textwithpicto function.
|
2017-02-17 17:11:14 +01:00 |
|
Laurent Destailleur
|
e1a6e6e4ab
|
Rename "attributes" into "variants" to avoid confusion with extrafields
|
2017-02-08 12:37:38 +01:00 |
|
Laurent Destailleur
|
b24f244f67
|
Merge pull request #5533 from marcosgdf/prod-attr
Feature Request: NEW Added product attributes feature
|
2017-02-08 11:20:33 +01:00 |
|
Laurent Destailleur
|
b611c5ca53
|
Merge pull request #6054 from atm-gauthier/develop_NEW_reduc_on_excess_received
NEW Develop new reduc on excess received
|
2017-02-08 11:16:10 +01:00 |
|
Laurent Destailleur
|
a673afe601
|
NEW Description of feature of a module into a dedicated popup
|
2017-02-04 14:16:17 +01:00 |
|
Marcos García de La Fuente
|
d06fb423c0
|
Merge branch 'develop' into prod-attr
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/langs/en_US/products.lang
|
2017-02-02 20:07:41 +01:00 |
|
Laurent Destailleur
|
c1b59b1950
|
Fix several security bugs on expense report
|
2017-01-26 18:08:00 +01:00 |
|
Laurent Destailleur
|
b1e5d8ce98
|
FIX Combo list of VAT is wrong on POS
|
2017-01-24 14:33:49 +01:00 |
|
Laurent Destailleur
|
65f7de8f64
|
Fix css and look 5.0
|
2017-01-22 12:13:32 +01:00 |
|
Laurent Destailleur
|
b8a80f9311
|
Fix code comment and missing showLinkToObjectBlock hook declaration as
an addreplace hook.
|
2017-01-21 17:30:35 +01:00 |
|
Laurent Destailleur
|
4047de82bd
|
Fix navigation on projects
|
2017-01-20 10:27:37 +01:00 |
|
Marcos García de La Fuente
|
d09a3628c5
|
Merge branch 'develop' into prod-attr
# Conflicts:
# htdocs/compta/facture.php
|
2017-01-14 23:59:14 +01:00 |
|
Laurent Destailleur
|
c42b48636a
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/commande/class/api_commande.class.php
htdocs/core/class/CMailFile.class.php
htdocs/societe/class/api_contact.class.php
|
2017-01-12 11:06:24 +01:00 |
|
Laurent Destailleur
|
1559c45a61
|
FIX link for not found photo when using gravatar. Must use external url
|
2017-01-10 09:24:55 +01:00 |
|
Marcos García de La Fuente
|
5669f734b8
|
Merge branch 'develop' into prod-attr
# Conflicts:
# htdocs/comm/propal/card.php
# htdocs/commande/card.php
# htdocs/compta/facture.php
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
|
2016-12-24 21:39:40 +01:00 |
|
Laurent Destailleur
|
43942e6ea2
|
Fix css and fix navigation on resource tab.
|
2016-12-23 13:04:46 +01:00 |
|
Laurent Destailleur
|
be19a999f5
|
Fix regression losing warning on not defined emails
|
2016-12-19 18:11:53 +01:00 |
|
Laurent Destailleur
|
6c4f15df63
|
Fix lot of fix in css look to match v5 rules.
|
2016-12-11 16:11:42 +01:00 |
|
Maxime Kohlhaas
|
7c82b18da0
|
New : allow to actualize currency rate
|
2016-12-10 22:07:25 +01:00 |
|
Maxime Kohlhaas
|
1f48e0486f
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_multicurrency_debug
|
2016-12-10 21:50:31 +01:00 |
|
Maxime Kohlhaas
|
eb8f89119f
|
Dynamic select currency
|
2016-12-10 16:20:37 +01:00 |
|
Laurent Destailleur
|
50bc65ce77
|
Add css to help debug
|
2016-12-10 13:05:38 +01:00 |
|
Laurent Destailleur
|
d23604701c
|
Fix responsive
|
2016-12-07 15:00:20 +01:00 |
|
Laurent Destailleur
|
083aef9b90
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2016-12-07 14:27:07 +01:00 |
|
Laurent Destailleur
|
1583d0e49f
|
Fix linkof mass action for pdf merge
|
2016-12-07 14:14:03 +01:00 |
|
fappels
|
bbbc768fa7
|
Change filter parameter to string with comma seperated values
Change warehousefilter from int to string with comma seperated values
for selectWarehouses and select_produits form functions.
|
2016-12-06 20:07:19 +01:00 |
|
fappels
|
c911f906c8
|
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status
|
2016-12-05 11:36:20 +01:00 |
|
Laurent Destailleur
|
788cbf9a01
|
Complete work on dol_banner on contracts
|
2016-12-04 13:30:17 +01:00 |
|
fappels
|
af5eb00933
|
Ignore filtering if service
|
2016-12-02 12:18:36 +01:00 |
|
fappels
|
b21fd14a11
|
Ignore Service, only filter warehouse if parameter set
|
2016-12-02 12:17:33 +01:00 |
|
fappels
|
2d4807190e
|
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status
|
2016-11-30 13:03:24 +01:00 |
|
fappels
|
49442c0b7f
|
Add filter on warehouse status to object line product list
|
2016-11-30 13:03:17 +01:00 |
|
gauthier
|
9a1309256d
|
Merge branch 'NEW_reduc_on_excess_received' of github.com:atm-gauthier/dolibarr into develop_NEW_reduc_on_excess_received
|
2016-11-28 17:13:09 +01:00 |
|
Marcos García de La Fuente
|
cf0ee36150
|
Merge branch 'develop' into prod-attr
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
|
2016-11-27 18:10:01 +01:00 |
|
gauthier
|
c433829d27
|
NEW : interface
|
2016-11-25 11:04:42 +01:00 |
|
Laurent Destailleur
|
2043c279b0
|
Merge remote-tracking branch 'origin/4.0' into develop
|
2016-11-20 15:47:40 +01:00 |
|
Laurent Destailleur
|
e6894eda0e
|
Better responsive
|
2016-11-20 10:58:28 +01:00 |
|
Laurent Destailleur
|
b538f13efb
|
FIX Module gravatar was not triggered on thirdparty and contact card
|
2016-11-19 19:43:55 +01:00 |
|
Laurent Destailleur
|
9b88ae145b
|
Fix mass action when using no javascript
|
2016-11-17 19:04:10 +01:00 |
|