Commit Graph

1768 Commits

Author SHA1 Message Date
fentman
9049931ff0 Change to $listofcurrenciesbefore for GBP + AUD
Update of functions.lib.php - function price()
$listofcurrenciesbefore to include USD, GBP, and AUD to support $ and £ appearing before amounts on invoices not after the amount
2015-01-09 22:55:17 +01:00
Laurent Destailleur
443c9d245e Merge pull request #2212 from marcosgdf/misc-doc
Miscellaneous corrections
2015-01-06 00:21:05 +01:00
aspangaro
b4b5b35afa Skype :: Better presentation 2015-01-04 20:17:49 +01:00
Laurent Destailleur
be34fcfa8a Removed duplicate link making same thing 2014-12-30 21:33:56 +01:00
Marcos García de La Fuente
86100758ff Miscellaneous corrections 2014-12-28 20:13:15 +01:00
Laurent Destailleur
657fc1b91c Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	ChangeLog
	htdocs/comm/fiche.php
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/fiche.php
	htdocs/langs/fr_FR/compta.lang
	htdocs/projet/element.php
	htdocs/projet/tasks/contact.php
	htdocs/projet/tasks/time.php
2014-12-26 04:44:15 +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
Marcos García de La Fuente
b68276637b Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some
masks

Conflicts:
	htdocs/core/lib/functions2.lib.php
2014-12-24 14:31:17 +01:00
Marcos García de La Fuente
46fe2c67e0 Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks 2014-12-22 22:32:05 +01:00
Laurent Destailleur
1dc2bbb0f1 Fixed: Var no declared 2014-12-22 03:01:31 +01:00
Laurent Destailleur
31f782ffe9 Fix: Several fixes into tasks and time spent management 2014-12-21 14:58:18 +01:00
Laurent Destailleur
74d5e11831 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-12-20 15:42:30 +01:00
Laurent Destailleur
8996953077 Fix: error reported by scrutinizer 2014-12-20 15:42:03 +01:00
Laurent Destailleur
c9f3267649 Fixed: bad conditions 2014-12-20 11:34:37 +01:00
Laurent Destailleur
854ed90a62 Fixed: bad place for the ajaxcombo. 2014-12-20 11:15:10 +01:00
Laurent Destailleur
d9aba405dd Fix: utf must be default value. 2014-12-18 10:09:47 +01:00
Laurent Destailleur
67cf3cb99b Fixed: BIC/SWIFT and IBAN must be at same level 2014-12-11 10:13:44 +01:00
Laurent Destailleur
a8052d8ea4 Fixed: Several fix in color management (function at wrong place, mark
param that are deprecated, convertion of value to get correct
format in all situation)
2014-12-08 19:12:27 +01:00
Juanjo Menent
430b2ff8db Fix: datepicker first day of week can be monday by setting into
display setup
2014-12-06 11:00:49 +01:00
Laurent Destailleur
83122ebe1e Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now
for release.
2014-12-04 13:20:56 +01:00
Laurent Destailleur
76bd7dd512 Fixed: A lot of fixed on project views (info on project area). Also add
a limit to avoid problem with very large database.
2014-12-04 11:03:48 +01:00
Laurent Destailleur
f3584fa211 Fixed: Button at wrong place
Fixed: Must use style css span badge for number of files
2014-12-01 00:53:15 +01:00
Laurent Destailleur
d3b32ce22f Fixed: Bad function/picto for information messages (not a star) 2014-11-28 19:49:42 +01:00
Laurent Destailleur
df9a6dae6c Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fichinter/fiche.php
2014-11-28 02:20:01 +01:00
Laurent Destailleur
38062177d3 Doxygen 2014-11-28 00:37:46 +01:00
Francis Appels
18406fc550 Fix: Show sender Country on PDF docs
Show sender Country on PDF docs when sender Country != receiver Country
2014-11-25 14:26:45 +01:00
Laurent Destailleur
671243e8f6 Fixed: Bugs reported by scrutinizer
Fixed: Solve conflict between ->iban and ->iban_prefix.
2014-11-22 16:57:08 +01:00
Laurent Destailleur
e3a8041b0d Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/compta/facture.php
	htdocs/user/fiche.php
2014-11-16 15:46:08 +01:00
Laurent Destailleur
539a201d3e Fix: doxygen 2014-11-15 18:30:37 +01:00
Laurent Destailleur
741adc79b2 Fix: Bugs reported by scrutinizer 2014-11-15 17:05:43 +01:00
Laurent Destailleur
ad661256c0 Fix: Bugs reported by scrutinizer 2014-11-15 16:20:03 +01:00
Laurent Destailleur
d98bfb1d8d Fix: Bugs reported by scrutinizer 2014-11-15 15:19:37 +01:00
Laurent Destailleur
6bac744709 Fix: Missing event management into select when combo not selected 2014-11-13 16:46:40 +01:00
Florian HENRY
c0a3606a59 Fix problem on task creation with chrome for french browser. 2014-11-12 22:53:23 +01:00
Laurent Destailleur
d164b2d0e1 Fix: Showing capital 2014-11-12 10:37:39 +01:00
Laurent Destailleur
0b70d26275 Keep commented code to keep a chance for old php version to work. 2014-11-07 22:06:51 +01:00
Laurent Destailleur
60ca5aa026 Debug of module withdraw. 2014-11-05 17:32:42 +01:00
Laurent Destailleur
5e0946bdc2 Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/adherents/fiche.php
	htdocs/core/lib/date.lib.php
	htdocs/langs/fr_FR/bills.lang
	htdocs/resource/class/resource.class.php
2014-11-05 16:37:07 +01:00
Laurent Destailleur
31c38cedbc Fix: checkstyle 2014-11-05 16:26:11 +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
420de76b4b Merge pull request #1993 from aspangaro/3.6-patch
GPLv3
2014-11-04 17:40:38 +01:00
aspangaro
f3d7da8feb Merge remote-tracking branch 'Upstream/develop' into develop-search 2014-11-03 20:25:36 +01:00
Laurent Destailleur
a4a01de8a1 Fix: Missing label 2014-11-03 18:00:11 +01:00
aspangaro
29c6797835 Merge remote-tracking branch 'Upstream/develop' into develop-search 2014-11-03 06:15:45 +01:00
Laurent Destailleur
ddf737daed Removed deprecated page and option. 2014-11-03 01:07:07 +01:00
aspangaro
a1980a1917 Correct travis error - Not me ! 2014-11-02 22:04:01 +01:00
Laurent Destailleur
627f5694f0 Fix: Infinite loop 2014-11-02 21:19:00 +01:00
Laurent Destailleur
84653f70be Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-11-02 21:16:56 +01:00
Laurent Destailleur
5a18904bb4 Fix: Infinite loop 2014-11-02 21:16:31 +01:00
Laurent Destailleur
b74bdb8f7d Fix: Bad error message 2014-11-02 11:39:30 +01:00