fentman
742ec954cd
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-08 11:21:25 +11:00
Laurent Destailleur
f7dd4a1357
Merge pull request #2222 from KreizIT/batch_improvement
...
Fix / Improve : [ bug #1747 ] Remove creation of batch 'Undefined'
2015-01-06 00:26:22 +01:00
Laurent Destailleur
ce1cad2801
Merge pull request #2207 from frederic34/patch-3
...
Enhance select_categories with select2
2015-01-06 00:17:43 +01:00
Laurent Destailleur
6ca90ffdad
Merge pull request #2206 from defrance69/patch-41
...
Update card.php
2015-01-06 00:17:12 +01:00
Laurent Destailleur
28fe8061c4
Merge pull request #2201 from IonAgorria/project-year-filter
...
Project searching by year
2015-01-06 00:13:37 +01:00
Laurent Destailleur
2ef9b4def6
Merge pull request #2198 from frederic34/patch-7
...
Typo
2015-01-06 00:08:41 +01:00
Laurent Destailleur
6916fffbe2
Merge pull request #2197 from frederic34/patch-5
...
Attribut width not allowed with div or span
2015-01-06 00:08:08 +01:00
Laurent Destailleur
38be767a7c
Merge pull request #2216 from frederic34/patch-10
...
Update cidlookup.php
2015-01-06 00:06:17 +01:00
Laurent Destailleur
d98f3937c8
Merge pull request #2217 from grandoc/develop
...
better translation and typo
2015-01-06 00:05:53 +01:00
Laurent Destailleur
e9a9ade30f
Merge pull request #2218 from ndrosis/patch-12
...
Fix Lang for cashdesk Check Payment Type
2015-01-05 23:52:48 +01:00
KreizIT
a7fc2b3779
Fix / Improve : [ bug #1747 ] Remove creation of batch 'Undefined'
2015-01-05 17:55:59 +01:00
Drosis Nikos
a5572eb200
Fix Lang for cashdesk Check Payment Type
2015-01-02 18:15:14 +02:00
philippe grand
96e6c66365
better translation and typo
2015-01-01 11:24:00 +01:00
Laurent Destailleur
baa247ea86
Fixed: doxygen
2014-12-30 21:24:57 +01:00
Laurent Destailleur
d72d056e02
Enhance look for contacts forms of thirdparties.
2014-12-30 21:04:02 +01:00
Frédéric FRANCE
ddcd086ada
Update cidlookup.php
2014-12-30 18:11:55 +01:00
Frédéric FRANCE
15c98ff2e1
Update cidlookup.php
2014-12-30 17:59:40 +01:00
Laurent Destailleur
8abbac564b
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/main.inc.php
2014-12-30 04:28:09 +01:00
Laurent Destailleur
3848daeab8
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/filefunc.inc.php
htdocs/product/stats/facture.php
2014-12-30 04:20:50 +01:00
Frédéric FRANCE
56dd276504
Enhance search_categories with select2
2014-12-28 15:17:54 +01:00
BENKE Charles
da0d0838e2
Update card.php
...
don't show line with empty duration when FICHINTER_HIDE_EMPTY_DURATION is active
2014-12-28 13:20:51 +01:00
Ion Agorria
bdd7e9df23
Added searching using year
2014-12-28 03:39:30 +01:00
Ion Agorria
af15fe7dad
Merge remote-tracking branch 'upstream/develop' into develop
2014-12-28 02:54:51 +01:00
Ion Agorria
250a995de8
Bug?
2014-12-28 02:54:42 +01:00
Frédéric FRANCE
6e69d5c4bd
Typo
2014-12-27 11:28:10 +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
c7937a9962
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
2014-12-27 02:22:09 +01:00
Laurent Destailleur
953e736a97
Prepare version 3.6.2
2014-12-27 02:21:37 +01:00
Laurent Destailleur
36f5715e47
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-12-27 01:13:30 +01:00
Laurent Destailleur
613d1b381b
Doxygen
2014-12-27 01:10:42 +01:00
Laurent Destailleur
41118a174a
Merge pull request #2195 from marcosgdf/bug-1714
...
Fix [ bug #1714 ] Id "sall" is used twice in different HTML tags
2014-12-26 22:11:37 +01:00
Laurent Destailleur
29db4d4670
Merge pull request #2194 from atm-maxime/develop
...
in PDF, no line jump after doc linked ref. Fix bug 1605.
2014-12-26 22:07:55 +01:00
Laurent Destailleur
0496d81b6a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-12-26 22:04:41 +01:00
Laurent Destailleur
5d80061caf
Mark property error as deprecated
2014-12-26 22:04:16 +01:00
Marcos García de La Fuente
9f6f90275a
Fix [ bug #1714 ] Id "sall" is used twice in different HTML tags
2014-12-26 12:03:29 +01:00
Maxime Kohlhaas
e7ebb78ffd
in PDF, no line jump after doc linked ref. Fix bug 1605.
2014-12-26 11:09:46 +01:00
Juanjo Menent
a901329a7d
Fix: Bad order field value
2014-12-26 09:43:55 +01:00
Juanjo Menent
bdf5f5726f
Fix: Bad order field value
2014-12-26 09:29:27 +01:00
Juanjo Menent
d40229e9cc
Fix: Bad order field value
2014-12-26 09:14:19 +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
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
Laurent Destailleur
75dbcf4a78
Fixed: doxygen
2014-12-26 04:35:48 +01:00
Laurent Destailleur
d18770c1e7
Merge remote-tracking branch 'origin/3.5' into 3.6
2014-12-26 04:16:08 +01:00
Laurent Destailleur
0e952c67ff
Merge pull request #2193 from marcosgdf/bug-1761
...
Fix: [ bug #1761 ] SQL error when installing 3.7 with PostgreSQL
2014-12-26 04:14:03 +01:00
Laurent Destailleur
490b0c5f3a
Merge branch 'marcosgdf-bug-1768' into 3.5
2014-12-26 04:13:36 +01:00
Laurent Destailleur
77e48f8c3e
Merge branch 'bug-1768' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-1768
2014-12-26 04:12:58 +01:00
Laurent Destailleur
882fd9a798
Merge branch 'marcosgdf-bug-1757' into 3.5
2014-12-26 04:11:30 +01:00
Laurent Destailleur
38c9d39c2b
Merge branch 'bug-1757' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-1757
Conflicts:
ChangeLog
2014-12-26 04:11:15 +01:00
Laurent Destailleur
4e2c321e4d
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
...
Conflicts:
ChangeLog
2014-12-26 04:09:08 +01:00
