Commit Graph

38143 Commits

Author SHA1 Message Date
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
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
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
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
Laurent Destailleur
05059da9e8 Fix: [ bug #1631 ] technical error in the display of associated objects
/ erreur technique à l'affichage des objets associés à un projet
2014-11-17 01:06:30 +01:00
Laurent Destailleur
737dfab5b2 Fix: If error on add line of type "product" when creating
proposal/order/invoice, do not show date of services.
2014-11-16 19:12:05 +01:00
Laurent Destailleur
8d4fc263c5 Fix: Var not defined 2014-11-16 18:37:09 +01:00
Laurent Destailleur
01279edfc8 Fixed: [ bug #1570 ] Negative supplier invoices do not appear in bank
planned transactions.
2014-11-16 16:36:32 +01:00
Laurent Destailleur
10117d045f Fixed #1637 2014-11-16 16:15:31 +01:00
Laurent Destailleur
e3a8041b0d Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/compta/facture.php
	htdocs/user/fiche.php
2014-11-16 15:46:08 +01:00
Laurent Destailleur
64a2cce7c0 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-11-16 14:11:19 +01:00
Laurent Destailleur
d4ad7236e5 Clean old code for multiselect (replaced with select2 plugin). 2014-11-16 00:46:27 +01:00
Laurent Destailleur
81e203eef1 Fix: Ref was not visible. 2014-11-15 20:48:39 +01:00
Laurent Destailleur
c186f13218 Fix: Param $action was not defined.
A better fix must be done later be removing useless hooks that are
duplicate with triggers.
2014-11-15 19:04:21 +01:00
Laurent Destailleur
539a201d3e Fix: doxygen 2014-11-15 18:30:37 +01:00
Laurent Destailleur
445f696d28 Fix: Pb of object with wrong type. 2014-11-15 18:24:38 +01:00
Laurent Destailleur
741adc79b2 Fix: Bugs reported by scrutinizer 2014-11-15 17:05:43 +01:00
Laurent Destailleur
ad661256c0 Fix: Bugs reported by scrutinizer 2014-11-15 16:20:03 +01:00
Laurent Destailleur
d98bfb1d8d Fix: Bugs reported by scrutinizer 2014-11-15 15:19:37 +01:00
Laurent Destailleur
d0fb732cce Fix: Bad value for ThousandSeparator. 2014-11-15 14:24:10 +01:00
Laurent Destailleur
683cdaf881 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-11-15 14:15:15 +01:00
Laurent Destailleur
11eb7de596 Try to clean sql to avoid mysql bug 2014-11-15 14:14:52 +01:00
Laurent Destailleur
2aeb0f4f5b Merge pull request #1941 from jfefe/patch-3
Avoid missing class error for fetch_thirdparty method
2014-11-15 12:36:41 +01:00
Laurent Destailleur
4df754f36f Merge pull request #2015 from aspangaro/develop-patch
Update accounting language
2014-11-15 12:19:23 +01:00
Laurent Destailleur
58c06264e4 Merge branch 'develop' of github.com:BadPixxel/dolibarr into
BadPixxel-develop

Conflicts:
	htdocs/langs/en_US/categories.lang
	htdocs/langs/fr_FR/categories.lang
2014-11-15 12:17:46 +01:00
Laurent Destailleur
eb41fc2765 Merge pull request #2018 from daamien/develop
Remove full descriptions from the product list in the contract card
2014-11-15 12:08:50 +01:00
Laurent Destailleur
962c4b9c32 Merge pull request #2019 from defrance69/patch-27
Patch 27
2014-11-15 12:07:05 +01:00
Laurent Destailleur
7faedf0c69 Uniformize code for search 2014-11-15 11:59:02 +01:00
Laurent Destailleur
e53157b28b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-11-15 00:57:50 +01:00
Laurent Destailleur
a46a6cccaf Fix: Screen page tests. Page tests are now ok with 3.7. 2014-11-15 00:57:31 +01:00
Laurent Destailleur
a3ab22e27d Fix: css 2014-11-15 00:16:59 +01:00
Florian HENRY
00c6033e11 Fix display user signature when WYSIWYG is enabled 2014-11-14 13:28:49 +01:00
Laurent Destailleur
425a853e07 - New: Match other auth system: Login can be done entering login or
user email (this open the road for SSO).
2014-11-14 11:56:05 +01:00
damien clochard
8dba0f9c85 Check PRODUIT_DESC_IN_FORM before printing the products desc 2014-11-14 00:21:39 +01:00
Laurent Destailleur
6bac744709 Fix: Missing event management into select when combo not selected 2014-11-13 16:46:40 +01:00
BENKE Charles
6cee8e1294 Update 3.6.0-3.7.0.sql
increase fieds size of ref supplier (order and bill)
2014-11-13 11:24:45 +01:00
BENKE Charles
38c2dc8747 Update llx_facture_fourn.sql
increase ref fields size (like customers facture)
2014-11-13 11:16:40 +01:00