Commit Graph

38107 Commits

Author SHA1 Message Date
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
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
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
BENKE Charles
0a1f5eff41 Update llx_commande_fournisseur.sql
extend ref fields size (like for customer commande)
2014-11-13 11:15:24 +01:00
BENKE Charles
0131acd930 Update llx_commande_fournisseur.sql
increase size of ref supplier (some supplier are very long ref...)
2014-11-13 11:06:21 +01:00
Laurent Destailleur
d164b2d0e1 Fix: Showing capital 2014-11-12 10:37:39 +01:00
Laurent Destailleur
608fa5eaed Fix: Avoid to load language when we can not. 2014-11-12 10:25:56 +01:00
Laurent Destailleur
81f0d953e3 Fix: Bad test 2014-11-12 10:05:40 +01:00
aspangaro
da258cd4b0 Typo & presentation 2014-11-12 07:29:57 +01:00
Laurent Destailleur
137b3f898d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2014-11-12 00:02:30 +01:00
Laurent Destailleur
6eabad65b7 Fix: Removed warning 2014-11-11 23:56:03 +01:00
Laurent Destailleur
47ebe21f7b Fix: Removed unused property 2014-11-11 23:38:56 +01:00
Laurent Destailleur
7177c04378 Minor css enhancement 2014-11-11 20:45:30 +01:00
aspangaro
c268b1fb64 Update accounting language
Problem with transifex in french, the file is in french language on the website but in github, still in english...
2014-11-11 14:49:26 +01:00
BadPixxel
8fc5faf4a8 Minor BugFix : Missing delete Category Multilangual fields
Delete of Multilangual fields was missing, impossible to delete category.

Fixed Error : 
Cannot delete or update a parent row: a foreign key constraint fails (`Dol-3.6`.`llx_categorie_lang`, CONSTRAINT `fk_category_lang_fk_category` FOREIGN KEY (`fk_category`) REFERENCES `llx_categorie` (`rowid`))
2014-11-10 16:29:05 +01:00
Laurent Destailleur
50f690787b Sync transifex 2014-11-09 19:16:41 +01:00
Laurent Destailleur
29298c73b9 Fix: Must show limit into list 2014-11-09 19:16:22 +01:00
Laurent Destailleur
6fd89c4b41 Fix: Missing translation 2014-11-08 20:05:56 +01:00
Laurent Destailleur
1dcca6e553 Avoid error 2014-11-08 00:49:52 +01:00
Laurent Destailleur
9ae03f533d Test 2014-11-08 00:35:28 +01:00
Laurent Destailleur
7ca2e275df Track travis bug 2014-11-08 00:10:05 +01:00
Laurent Destailleur
429cae5d2e Recherche bug travis 2014-11-07 23:58:30 +01:00
Laurent Destailleur
6762b98c00 Minor look enhancement during debug 2014-11-07 23:25:39 +01:00
Laurent Destailleur
4c1b1408ed Fix: Removed duplicate menu entry 2014-11-07 23:15:02 +01:00
Laurent Destailleur
e3f4db85af Fix divers 2014-11-07 23:07:15 +01:00
Laurent Destailleur
8a89997c79 Fix: bug into edition of extrafields 2014-11-07 22:40:13 +01:00
Laurent Destailleur
83d441f8ff Show field alwayseditable 2014-11-07 22:24:52 +01:00
Laurent Destailleur
3d5a45e274 Fix: textarea too small 2014-11-07 22:19:31 +01:00
Laurent Destailleur
0b70d26275 Keep commented code to keep a chance for old php version to work. 2014-11-07 22:06:51 +01:00
Laurent Destailleur
0559e29c92 Prepare freeze 2014-11-07 21:52:50 +01:00
Laurent Destailleur
5094c2c066 Merge pull request #1998 from frederic34/iconstock
Try to improve stock display for all stock increase/decrease options
2014-11-07 21:48:04 +01:00
Laurent Destailleur
5cb6b11878 Merge pull request #2007 from aspangaro/develop-search
Improvement into list & presentation/typo
2014-11-07 21:47:37 +01:00
Laurent Destailleur
9e92b469b9 Merge pull request #2005 from altairis-fr/hidemargininfos
improve "hide margin infos" button : hide ALL informations relatives to margin AND store the state of the button in a cookie instead of shared config option
2014-11-07 21:47:06 +01:00