Commit Graph

44437 Commits

Author SHA1 Message Date
Frédéric FRANCE
c97e95f6ab Update /contrat/services.php 2014-11-23 17:43:44 +01:00
Frédéric FRANCE
84d3bd2b43 Update /expedition/list.php 2014-11-23 17:43:40 +01:00
Frédéric FRANCE
b396ccaf73 Update /fichinter/list.php 2014-11-23 17:43:36 +01:00
Frédéric FRANCE
e6da4a2518 Update /comm/list.php 2014-11-23 17:43:32 +01:00
Frédéric FRANCE
baaadd772e Update /holiday/index.php 2014-11-23 17:43:28 +01:00
Frédéric FRANCE
28e620a7bf Update /cron/list.php 2014-11-23 17:43:24 +01:00
Frédéric FRANCE
d17b5268fa (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 17:43:19 +01:00
Laurent Destailleur
652b0f84a7 Fixed: Field is used only by module accounting so must have a condition
on it.
2014-11-23 17:03:22 +01:00
Marcos García de La Fuente
1347a16fd3 Fixed[ bug #1661 ] Bookmarks list "Target" translation missing 2014-11-23 16:55:40 +01:00
Marcos García de La Fuente
a927a04421 Fixed [ bug #1705 ] Members statistics menu entry strange target 2014-11-23 16:55:32 +01:00
Marcos García de La Fuente
5578bc6f5d Fixed [ bug #1658 ] Linked files in supplier invoices wrongly shows amounts 2014-11-23 16:55:12 +01:00
Laurent Destailleur
1635f725c8 Merge remote-tracking branch 'origin/3.6' into 3.7 2014-11-23 16:51:25 +01:00
Laurent Destailleur
1f986014f1 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-11-23 16:50:08 +01:00
Laurent Destailleur
7678f9b13c Merge pull request #2069 from frederic34/patch-4
Fix 1662 Search filter display discrepancy
2014-11-23 16:48:59 +01:00
Laurent Destailleur
becbf9eada Merge pull request #2068 from frederic34/patch-3
Fix 1667 Pagination is only partially shown in supplier references list
2014-11-23 16:48:44 +01:00
Laurent Destailleur
bd8391163a Merge pull request #2067 from frederic34/patch-2
Fix bug 1692 Can't update phone_pro with the contact webservice
2014-11-23 16:48:33 +01:00
Laurent Destailleur
989cd87446 Merge pull request #2066 from altatof/fix_margin_recap
FIX: bad margin and buy_price calculation when total_ht = 0 (discount 100%) on a line
2014-11-23 16:48:21 +01:00
Marcos García de La Fuente
eb569fe235 Fixed [ bug #1712 ] Unable to add a social charge 2014-11-23 16:43:52 +01:00
Laurent Destailleur
1c1e2ed246 Better comment 2014-11-23 13:19:28 +01:00
Laurent Destailleur
3aef9d928b Fix: W3C 2014-11-23 13:14:03 +01:00
Laurent Destailleur
97a6bd842d Minor fixes. 2014-11-23 12:39:53 +01:00
Frédéric FRANCE
ffd435d9ff Fix 1662 Search filter display discrepancy 2014-11-23 01:20:02 +01:00
Frédéric FRANCE
b2a1408d8e Fix 1667 Pagination is only partially shown in supplier references list 2014-11-23 00:51:13 +01:00
Frédéric FRANCE
891f8d9442 Fix bug 1692 Can't update phone_pro with the contact webservice 2014-11-22 19:02:15 +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
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
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
b686789a31 Merge branch 'aspangaro-1680' into 3.7 2014-11-22 15:57:15 +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
5afc509d5f Merge branch 'aspangaro-1698' into 3.7 2014-11-22 15:45:11 +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