aspangaro
b7babb8a48
Problem of traduction
2016-12-11 14:13:48 +01:00
Laurent Destailleur
190f432c23
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-12-11 11:07:22 +01:00
Laurent Destailleur
4969af8c74
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
ChangeLog
htdocs/product/card.php
2016-12-11 11:04:15 +01:00
Laurent Destailleur
9b436ce871
Merge remote-tracking branch 'origin/3.9' into 4.0
...
Conflicts:
htdocs/product/class/product.class.php
2016-12-11 02:51:32 +01:00
Maxime Kohlhaas
f7524b93ad
Actualize currency on supplier order and invoice
2016-12-11 02:50:21 +01:00
Maxime Kohlhaas
177ec97689
Actualize currency on propal, order and invoice
2016-12-11 01:04:58 +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
Regis Houssin
239e42faa0
Fix: contract use "total_vat" instead "total_tva"
2016-12-09 13:04:05 +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
Laurent Destailleur
9efcda6714
Merge pull request #6086 from fappels/develop-work-on-warehouse-status
...
New continue work on warehouse status #5115
2016-12-07 13:06:07 +01:00
Laurent Destailleur
c2bee0f937
FIX #6088
2016-12-07 12:44:56 +01:00
Laurent Destailleur
455a9ed4da
FIX security in import of files
2016-12-07 12:41:48 +01:00
fappels
085d44eaba
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status
2016-12-06 20:15:45 +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
Laurent Destailleur
017e384f16
FIX Preselected value for extrafield link was not correctly set
2016-12-06 13:10:44 +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
Laurent Destailleur
874bb488da
Fix bad comment
2016-11-29 23:42:56 +01:00
Laurent Destailleur
bd8f923cee
Several fixes in filter on lists
2016-11-29 22:52:16 +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
Laurent Destailleur
5e5ce0043e
Debug module ECM.
2016-11-28 12:03:33 +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
Laurent Destailleur
e4a8342aef
Fix div-table-form balance on all lists (solve responsive design)
2016-11-27 11:41:10 +01:00
Laurent Destailleur
16ce156631
Fix responsive design
2016-11-25 18:32:52 +01:00
gauthier
c433829d27
NEW : interface
2016-11-25 11:04:42 +01:00
Laurent Destailleur
60b1591f0e
Fix the notes must not be into the tooltip of ref.
2016-11-23 20:30:43 +01:00
Laurent Destailleur
2043c279b0
Merge remote-tracking branch 'origin/4.0' into develop
2016-11-20 15:47:40 +01:00
Laurent Destailleur
cb99113ab0
Css
2016-11-20 15:47:14 +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
e9b78db1ac
Several bug fixes:
...
missing import_key field, ref generator parameter must be task not
project, import must use css, serious database integrity problem
accepting duplicate tasks.
2016-11-19 02:16:12 +01:00
Laurent Destailleur
9b88ae145b
Fix mass action when using no javascript
2016-11-17 19:04:10 +01:00
florian HENRY
afd17feffe
Merge remote-tracking branch 'origin/develop' into franck_develop
2016-11-16 09:38:50 +01:00
Laurent Destailleur
5539415354
FIX Remove hard coded value '1' for default payment term id. Use quick
...
hack by adding hidden constant to avoid this.
2016-11-15 10:43:03 +01:00
moreauf
081be37787
NEW: Add project and Hook to Loan
...
BUG: Correct discard_closed parametters management in project
2016-11-14 19:25:50 +01:00
Laurent Destailleur
381b77850c
Fix do not show cloning of virtual product if option is off
2016-11-14 02:08:41 +01:00
Laurent Destailleur
04063a62a8
Better responsive
2016-11-12 15:18:38 +01:00
Laurent Destailleur
4bcc7dc8a0
CLOSE #4368 #4369 Add hook completeTabsHead for rewrite heads tabs menu
2016-11-12 14:36:52 +01:00
Laurent Destailleur
b1bd9e4930
Responsive design
2016-11-11 23:17:37 +01:00
Laurent Destailleur
cd9f1db229
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/fiche-rec.php
2016-11-11 15:12:30 +01:00
Laurent Destailleur
e4617ec76c
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/core/filemanagerdol/connectors/php/config.php
htdocs/viewimage.php
2016-11-11 15:03:05 +01:00
