lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,416 Commits 43 Branches 150 Tags 886 MiB
aa4f16ce99
Commit Graph

44416 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aspangaro
aa4f16ce99 Add resource language file in transifex 2014-11-23 21:02:49 +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
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
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
Laurent Destailleur
7fbeb2cbcb Merge pull request #2053 from aspangaro/1688 
#1688 The ref filter searches on rowid not on ref in unpaid supplier inv...
 2014-11-22 15:41:39 +01:00
BENKE Charles
730bf1c25c Update html.formcontract.class.php 
bad filtering on contract list (same sql rule as project)
 2014-11-22 15:41:18 +01:00
Laurent Destailleur
a47c7f02e2 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-22 15:37:34 +01:00
Laurent Destailleur
eaa4b6cb56 Add PR manually because of conflict "#1678 & #1677 Untranslatable token" 2014-11-22 15:37:18 +01:00
Laurent Destailleur
f0d32e3b65 Merge pull request #2059 from aspangaro/1657 
#1657 Intervention preview date is not displayed
 2014-11-22 15:33:49 +01:00
Laurent Destailleur
135e58871e Merge pull request #2061 from aspangaro/1704 
#1704 Untranslatable token in externalsite module admin
 2014-11-22 15:33:18 +01:00
Laurent Destailleur
4b2e0b555a Merge pull request #2062 from aspangaro/1706 
#1706 Missing table cell in shipment list header + Search fields doesn't...
 2014-11-22 15:31:41 +01:00
Laurent Destailleur
088dd1d2e9 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-22 15:30:37 +01:00
Laurent Destailleur
b5e64b66c8 Merge pull request #2025 from GPCsolutions/dbupgrade 
Work around tms bugs with MariaDB
 2014-11-22 15:26:42 +01:00
Laurent Destailleur
43f3e28fd6 Fixed: [ bug #1645 ] Can't list contracts 2014-11-22 15:12:36 +01:00
Laurent Destailleur
d6f47227fe Fixed: [ bug #1646 ] Can't list unpaid invoices 2014-11-22 15:09:54 +01:00
Laurent Destailleur
a2d4046f50 Fixed: Untranslatable tokens 2014-11-22 00:45:04 +01:00
Laurent Destailleur
068c7fdb2d Fixed: [ bug #1635 ] le tiers n'apparait plus sur la fiche tache 2014-11-22 00:31:19 +01:00
Laurent Destailleur
95d7dc4841 Fixed: [ bug #1565 ] Customer order label for status 2 is not coherent 
in french
 2014-11-22 00:08:06 +01:00
Laurent Destailleur
5acdce0b9f Fixed: [ bug #1647 ] Can't list tax payments 2014-11-21 23:52:12 +01:00
Laurent Destailleur
6bc3dd67a8 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-21 23:47:24 +01:00
Laurent Destailleur
ce98036725 Fixed: [ bug #1648 ] Can't see turnover report by product/services 2014-11-21 23:45:56 +01:00
Laurent Destailleur
dba27f4a39 Merge pull request #2057 from frederic34/patch-10 
#1650 Can't display supplier products in it's card
 2014-11-21 23:40:38 +01:00
Laurent Destailleur
32f4db259c Fix: [ bug #1651 ] Can't display margins in thirdparty card 2014-11-21 23:39:02 +01:00