Commit Graph

56883 Commits

Author SHA1 Message Date
Laurent Destailleur
f67863e1aa NEW Can use any filter on all REST API to list. 2016-10-25 19:15:47 +02:00
phf
3e2f39fbc0 Fix on first activate module it must create if needed the first currency rate from general settings 2016-10-25 13:31:36 +02:00
phf
a947ac55f9 Fix get multicurrency rowid from code must be filtered by entity 2016-10-25 12:45:23 +02:00
Laurent Destailleur
5d655d47fe Enhance css 2016-10-25 12:36:14 +02:00
phf
1dc0dfc065 Fix fetch multicurrency object from code must be filter by entity 2016-10-25 12:07:34 +02:00
Laurent Destailleur
6ef74b33c9 Uniformize code 2016-10-25 11:09:26 +02:00
Juanjo Menent
94a884cea8 Fix: Use undeclared variable 2016-10-25 09:45:53 +02:00
Juanjo Menent
94d1e6180e Merge remote-tracking branch 'upstream/develop' into develop 2016-10-25 09:44:54 +02:00
florian HENRY
237d04e3c0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_consomption_thirdparty_withmorefigures 2016-10-25 09:44:03 +02:00
aspangaro
6e7f104c5f Update works 2016-10-25 07:41:01 +02:00
Laurent Destailleur
384abd8462 Uniformize look and feel 2016-10-25 02:56:46 +02:00
Laurent Destailleur
7b3793c775 Fix W3C on FTP setup page 2016-10-25 02:33:40 +02:00
Laurent Destailleur
b15535c1f1 Uniformize code 2016-10-25 02:04:46 +02:00
IJ
dcd11f0c71 FIX: Missing Supplier Order Translation String 2016-10-24 23:20:24 +01:00
Laurent Destailleur
eb37c72513 Uniformise code 2016-10-24 20:56:48 +02:00
Laurent Destailleur
aad4380689 Uniformise code 2016-10-24 20:52:21 +02:00
Sergio Sanchis Climent
2a4517e1bc FIX: #5907 2016-10-24 19:21:41 +02:00
Juanjo Menent
9ab25d4472 Fix: Use undeclared variable 2016-10-24 18:51:46 +02:00
Laurent Destailleur
36c2b5afcd Responsive 2016-10-24 18:43:17 +02:00
Laurent Destailleur
6bd219b117 Fix column task ref/label 2016-10-24 17:47:31 +02:00
Laurent Destailleur
bc2342e9a4 Fix bad link 2016-10-24 17:37:39 +02:00
Laurent Destailleur
f1421a2ee4 Rename constant with english name 2016-10-24 13:10:35 +02:00
Laurent Destailleur
0ae5a3799c Fix html 2016-10-24 12:42:37 +02:00
Laurent Destailleur
8222f7a78b Fix translation 2016-10-24 12:24:46 +02:00
Laurent Destailleur
3b05d00163 Better responsive design 2016-10-24 12:06:33 +02:00
Laurent Destailleur
6338b04ac0 Remove call of a deprecated function 2016-10-24 11:27:39 +02:00
François Koessler
6fe902d1e3 Update Dockerfile
Add missing backslash otherwise image won't build
2016-10-24 10:42:56 +02:00
Benoit
a46e7d8e1a Change inputalsopricetotalwithtax to outputalsopricetotalwithtax 2016-10-24 10:18:24 +02:00
florian HENRY
201e084186 style 2016-10-24 09:07:21 +02:00
florian HENRY
5dcf3033ec Merge branch 'develop' into dev_consomption_thirdparty_withmorefigures 2016-10-24 08:53:51 +02:00
florian HENRY
4c4e404dae Add unit PRice 2016-10-24 08:53:39 +02:00
aspangaro
6314df035a Work on expense report accountancy integration 2016-10-24 07:16:26 +02:00
aspangaro
dc727ebb3c Accountancy - Add binding and journal for expense reports 2016-10-24 06:41:32 +02:00
aspangaro
0d62148a0f Accountancy - Add menu expense report accounts in configuration 2016-10-24 06:27:20 +02:00
aspangaro
845c770d01 War against colspan - Supplier payment card 2016-10-24 05:53:59 +02:00
aspangaro
d0544b0aea Merge remote-tracking branch 'Upstream/develop' into 5.0-p29 2016-10-24 05:27:49 +02:00
aspangaro
337e9db046 New: Expense report documents are now available in ECM module 2016-10-24 05:26:19 +02:00
Laurent Destailleur
39bc78909b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2016-10-24 03:35:43 +02:00
Laurent Destailleur
33a7b7037d Save information of vat code into database 2016-10-24 03:23:40 +02:00
Laurent Destailleur
c976044d70 Merge pull request #5910 from aspangaro/5.0-p28
Better presentation for member edit card
2016-10-24 03:20:24 +02:00
Laurent Destailleur
09ef693c5f Merge pull request #5908 from openthink-laurent/add-file-scheme-allowed-uris-schemes-links
NEW Add file:// scheme to allowed URIs schemes for links
2016-10-24 03:19:53 +02:00
Laurent Destailleur
e4da87d31c Merge pull request #5903 from atm-gauthier/FIX_thirdparty_margin
FIX : margin tab on customer card must filter on current entity invoices
2016-10-24 03:18:37 +02:00
Laurent Destailleur
4e23f1adf1 Merge pull request #5902 from aspangaro/5.0-p25
Better presentation of invoice payment page
2016-10-24 02:43:44 +02:00
Laurent Destailleur
9560ec54cc Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
Conflicts:
	htdocs/compta/facture/list.php
2016-10-24 02:15:12 +02:00
Laurent Destailleur
acf8874c6a Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
Conflicts:
	htdocs/core/lib/functions.lib.php
2016-10-24 02:11:49 +02:00
Laurent Destailleur
a6c2758ca2 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
Conflicts:
	htdocs/core/lib/functions.lib.php
2016-10-24 02:10:17 +02:00
Laurent Destailleur
18fad2088a git push origin developMerge branch 'atm-florian-dev_resource_extrafields' into develop 2016-10-24 02:05:56 +02:00
Laurent Destailleur
fdcc858008 Merge branch 'dev_resource_extrafields' of
https://github.com/atm-florian/dolibarr into
atm-florian-dev_resource_extrafields

Conflicts:
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-10-24 02:05:34 +02:00
Laurent Destailleur
2f77549d2b Merge pull request #5897 from olsesacl/4-search-forun
FIX: Search provider by price
2016-10-24 02:04:01 +02:00
Laurent Destailleur
b1cab83af5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-24 02:02:40 +02:00