Commit Graph

38255 Commits

Author SHA1 Message Date
Frédéric FRANCE
fef3cfbe81 Update /compta/facture/list.php 2014-11-23 09:55:13 +01:00
Frédéric FRANCE
865ec76a51 Update /compta/salaries/index.php 2014-11-23 09:54:17 +01:00
Frédéric FRANCE
c9a0208328 Update /compta/paiement/list.php 2014-11-23 09:53:19 +01:00
Frédéric FRANCE
cfe5784d49 Update /compta/bank/search.php 2014-11-23 09:52:35 +01:00
Frédéric FRANCE
fe725f1d8a Update /compta/sociales/index.php 2014-11-23 09:51:49 +01:00
Frédéric FRANCE
adf0e8bb54 Update /compta/tva/reglement.php 2014-11-23 09:51:03 +01:00
Frédéric FRANCE
37eef59b50 Update /compta/prelevement/list.php 2014-11-23 09:50:19 +01:00
Frédéric FRANCE
d6e8211018 Update /compta/deplacement/list.php 2014-11-23 09:49:30 +01:00
Frédéric FRANCE
979eadf42e Update /compta/dons/list.php 2014-11-23 09:48:54 +01:00
Frédéric FRANCE
5b0b222772 Update /societe/societe.php 2014-11-23 09:48:13 +01:00
Frédéric FRANCE
fbee671db1 Update /societe/consumption.php 2014-11-23 09:47:19 +01:00
Frédéric FRANCE
09f1f79f4e Update /adherents/list.php 2014-11-23 09:46:24 +01:00
Frédéric FRANCE
89deffa3a7 Update /fourn/list.php 2014-11-23 09:36:07 +01:00
Frédéric FRANCE
7442b1a6b1 Update /contrat/list.php 2014-11-23 09:34:56 +01:00
Frédéric FRANCE
6f3ce0a63b Update /contrat/services.php 2014-11-23 09:34:20 +01:00
Frédéric FRANCE
91aca474dd Update /expedition/list.php 2014-11-23 09:33:32 +01:00
Frédéric FRANCE
b43f8eede3 Update /fichinter/list.php 2014-11-23 09:32:46 +01:00
Frédéric FRANCE
46aea31e6c Update /comm/list.php 2014-11-23 09:31:20 +01:00
Frédéric FRANCE
a10209ae9f Update /holiday/index.php 2014-11-23 09:30:32 +01:00
Frédéric FRANCE
54541f9f14 Update /cron/list.php 2014-11-23 09:29:04 +01:00
Frédéric FRANCE
d9fdf82391 (GETPOST("button_removefilter_x") || GETPOST("button_removefilter"))
if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
2014-11-23 01:21:51 +01:00
Laurent Destailleur
2a56a19b7d Merge remote-tracking branch 'origin/3.7' into develop 2014-11-22 16:59:12 +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
02e18bc03d Merge remote-tracking branch 'origin/3.7' into develop 2014-11-22 16:29:06 +01:00
Laurent Destailleur
8b545af325 Merge pull request #1982 from atm-alexis/feature_agenda_files_on_card_view
add files view into agenda card
2014-11-22 16:24:09 +01:00
Laurent Destailleur
d8767bfbae Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/product/class/product.class.php
2014-11-22 16:10:14 +01:00
Laurent Destailleur
9aab62ab36 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-11-22 16:03:09 +01:00
Laurent Destailleur
2f4de2ef75 Merge pull request #2016 from altatof/3.5
FIX: copy extrafields when creating order from propale and creating
2014-11-22 16:02:13 +01:00
Laurent Destailleur
31a5a46ffa Merge pull request #2022 from asirinelli/3.7
Add EIRL in llx_c_forme_juridique
2014-11-22 16:00:32 +01:00
Andrelec1
667f1bf497 Fix : more than 1000 holidays
Si il y a plus de 1000 jours de congés, le délimiteur des millier fais
bugger les calcule ...
2014-11-22 15:59:51 +01:00
Laurent Destailleur
3d968aa432 Merge pull request #2027 from Devensys/Develop-FixGRHconge1
FIX bug in GRH module
2014-11-22 15:59:12 +01:00
Laurent Destailleur
e8b2206629 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-22 15:57:33 +01:00
Laurent Destailleur
86a3a4f618 Merge branch '1680' of github.com:aspangaro/dolibarr into aspangaro-1680
Conflicts:
	htdocs/comm/propal/list.php
2014-11-22 15:57:06 +01:00
Laurent Destailleur
e6e5cb471d Merge pull request #2040 from aspangaro/1681
#1681 Clear sort filter works partially in customers list
2014-11-22 15:54:57 +01:00
Laurent Destailleur
432b623dac Merge pull request #2041 from aspangaro/1684
#1684 Clear sort filter works partially in interventions list
2014-11-22 15:54:38 +01:00
Laurent Destailleur
34306359a4 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-22 15:54:14 +01:00
Laurent Destailleur
9ddb76ca12 Merge pull request #2042 from frederic34/patch-9
#1664 Can't sort by mobile phones in contact list
2014-11-22 15:53:55 +01:00
Laurent Destailleur
d3e216c19a Clear compatible with all browsers 2014-11-22 15:53:37 +01:00
Laurent Destailleur
0e44e05600 Merge pull request #2043 from frederic34/patch-2
#1665 Can't clear sort filter on contacts list
2014-11-22 15:52:36 +01:00
Laurent Destailleur
d7b0aab71a Clear works with all browsers 2014-11-22 15:52:08 +01:00
Laurent Destailleur
a7df54ef0d Merge pull request #2044 from frederic34/patch-3
#1666 Clear sort filter works partially in product/services
2014-11-22 15:51:07 +01:00
Laurent Destailleur
6c7bab8d8c Merge pull request #2045 from frederic34/patch-4
#1682 Date is missing in proposals list
2014-11-22 15:50:50 +01:00
Laurent Destailleur
86f2f191ea Merge pull request #2046 from frederic34/patch-5
#1683 Can't clear sort filter on proposals list
2014-11-22 15:50:37 +01:00
Laurent Destailleur
e4804f99ff Merge pull request #2047 from frederic34/patch-6
#1685-1686 Clear sort filter works partially in supplier invoices
2014-11-22 15:50:16 +01:00
Laurent Destailleur
830d470c33 Merge pull request #2047 from frederic34/patch-6
#1685-1686 Clear sort filter works partially in supplier invoices
2014-11-22 15:48:28 +01:00
Laurent Destailleur
d6cb29a17b Merge pull request #2048 from frederic34/patch-7
#1689 Can't sort supplier invoice payments on amounts
2014-11-22 15:47:55 +01:00
Laurent Destailleur
8c440dea4a Fxied: Syntax error 2014-11-22 15:47:14 +01:00
Laurent Destailleur
a6867fef0f Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-22 15:46:07 +01:00
Laurent Destailleur
b9cf6ddd65 Merge branch '1698' of github.com:aspangaro/dolibarr into aspangaro-1698
Conflicts:
	htdocs/langs/en_US/donations.lang
2014-11-22 15:44:59 +01:00
Laurent Destailleur
dfae42cd4a Merge pull request #2051 from aspangaro/1690
#1672 VAT accounts by default are lost in migration
2014-11-22 15:41:58 +01:00