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
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
Laurent Destailleur
b644075faa
Fix: doxygen
2014-11-20 23:41:58 +01:00
Laurent Destailleur
f7a74a9ac9
Fix: CRLF
2014-11-20 16:16:15 +01:00
Laurent Destailleur
8bf402593a
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2014-11-20 15:39:50 +01:00
Laurent Destailleur
95de38e102
Start to fix [ bug #1711 ] Projet cloturé toujours visible dans les
...
autres module pour affectation but it is a too important change.
2014-11-20 15:32:10 +01:00
Laurent Destailleur
0f5203b384
Edit vat
2014-11-20 15:08:13 +01:00
Laurent Destailleur
8ffae31175
Merge pull request #2055 from frederic34/patch-8
...
#1695 SQL error on task creation
2014-11-20 14:47:45 +01:00
Laurent Destailleur
d462facf6d
Fixed: [ bug #1653 ] Can't access task notes
2014-11-20 14:44:49 +01:00
Laurent Destailleur
ea02bdf85e
Fix: duplicate function
2014-11-20 13:06:05 +01:00
Laurent Destailleur
76b8ff9416
Fix: css
2014-11-20 11:34:43 +01:00
Laurent Destailleur
2264009247
Fix: css
2014-11-20 11:24:06 +01:00
Laurent Destailleur
9f6a6d1300
Fix: Missing translation
2014-11-20 10:55:38 +01:00
Laurent Destailleur
c8cd36f3e6
Fixed: ref supplier was visible with label Ref customer.
2014-11-20 10:48:55 +01:00
Laurent Destailleur
d94d7f683b
Try to solve warning.
2014-11-20 10:31:59 +01:00
Laurent Destailleur
358ddb0abc
Fix: W3C. form into table is forbidden. This makes some browsers crazy.
2014-11-20 10:15:24 +01:00
aspangaro
4b229dabfd
#1706 Missing table cell in shipment list header + Search fields doesn't work
2014-11-20 06:55:38 +01:00
aspangaro
01a5f22f4a
#1704 Untranslatable token in externalsite module admin
2014-11-20 06:34:50 +01:00
aspangaro
0ec30ea8c0
Merge remote-tracking branch 'Upstream/3.7' into 1657
2014-11-20 06:03:50 +01:00
aspangaro
4d48205e45
#1657 Intervention preview date is not displayed
2014-11-20 06:01:08 +01:00
Laurent Destailleur
179834c663
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2014-11-19 23:10:49 +01:00
Laurent Destailleur
f7206c2a52
Fixed: [ bug #1578 ] Cannot create proposal by copy of another one
2014-11-19 23:10:30 +01:00
Frédéric FRANCE
93ed5875d3
#1650 Can't display supplier products in it's card
...
I think error is in sql request for last supplier invoice list because there is no sql request in supplier products
To avoid error in mysql strict mode
sql-mode="STRICT_ALL_TABLES,ONLY_FULL_GROUP_BY,NO_ZERO_DATE"
2014-11-19 15:50:18 +01:00
Juanjo Menent
9e28452379
Fix: remove duplicate code
2014-11-19 10:02:01 +01:00
Laurent Destailleur
84729a6aa3
Fix: Bad vars
2014-11-18 23:18:59 +01:00
Frédéric FRANCE
3dea1fd68f
#1695 SQL error on task creation
2014-11-18 22:53:39 +01:00
aspangaro
e3edc3f690
#1688 The ref filter searches on rowid not on ref in unpaid supplier invoices list
2014-11-18 21:55:41 +01:00
Laurent Destailleur
8b0a9d78bb
Fix: CRLF
2014-11-18 19:03:02 +01:00
Laurent Destailleur
80e62697f0
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/bank/treso.php
2014-11-18 19:01:01 +01:00
Laurent Destailleur
1b24356e0f
ssl option is set to CURL_SSLVERSION_TLSv1.
...
Some site disabled ssl v1 to 3 (ex: paypal).
2014-11-18 17:13:08 +01:00
Laurent Destailleur
c8fe538de2
Fix: Filter were lost
2014-11-18 14:37:19 +01:00
Laurent Destailleur
c077998ff8
Fix: Line not visible when there is a lot of lines.
2014-11-18 14:37:14 +01:00
Laurent Destailleur
31f987706c
Fix: bugs reported by scrutinizer
2014-11-17 15:13:23 +01:00
Raphaël Doursenaud
079dbf9fbd
Work around bug #1644
2014-11-17 14:59:14 +01:00