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

44333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
33ddbd7425 Merge pull request #1932 from Xebax/develop 
Fix bug #1604: "When a member is created, the birthday is not recorded" and bug #1610: "Civility is not displayed".
 2014-10-03 03:17:45 +02:00
Laurent Destailleur
c69565fd69 Fix: column name should not be an numeric 2014-10-03 03:12:39 +02:00
Laurent Destailleur
eae5e1d8f0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-03 02:49:44 +02:00
Laurent Destailleur
ebd86f5388 Merge pull request #1931 from ndrosis/patch-8 
Fix Lang for Payment Type
 2014-10-03 02:47:25 +02:00
Laurent Destailleur
4c28454729 Merge pull request #1934 from GPCsolutions/deps 
Suggest dependencies needed by PHPExcel
 2014-10-03 02:46:38 +02:00
Laurent Destailleur
d455ee7b56 Merge pull request #1933 from atm-maxime/3.5 
Fix : tva not coming from multiprice
 2014-10-03 02:46:22 +02:00
Laurent Destailleur
b5be8ff620 Fix: Avoid error ErrorBadValueForParamNotAString 2014-10-03 02:45:47 +02:00
Laurent Destailleur
ae303f34a4 Merge pull request #1935 from FHenry/3.6_fix 
3.6 fix -  	Fix trad currency -  Return error message on category creation failure
 2014-10-03 02:42:32 +02:00
Laurent Destailleur
5ac63ec534 Solve fixme. 2014-10-03 02:00:50 +02:00
Laurent Destailleur
7fb2d4d1c9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-03 01:48:28 +02:00
Laurent Destailleur
8bc57e38d1 Uniformize, support, install and login page with a more neutral 
background (nearest bootstrap). Remove image background.
 2014-10-03 01:48:14 +02:00
Florian HENRY
4b28ff005e Return error message on category creation failure 2014-10-02 15:24:40 +02:00
Florian HENRY
d6fc967162 Merge branch '3.6' into 3.6_fix 2014-10-02 15:22:23 +02:00
Florian HENRY
78ec4d595b Fix trad currency 2014-10-02 15:21:49 +02:00
Regis Houssin
4248c7bed2 Fix: strict mode paradise 2014-10-02 09:30:31 +02:00
Regis Houssin
30221ae8cf Fix: missing fields 2014-10-02 09:00:40 +02:00
Regis Houssin
2425fdfadd FIXME $socid is not defined (strict mode) 2014-10-02 08:44:49 +02:00
Regis Houssin
1541be8790 FIXME $key is not defined (strict mode) 2014-10-02 08:40:51 +02:00
Xebax
add55e480e Fix bug #1610: Civility is not displayed. 2014-10-01 22:00:45 +02:00
Raphaël Doursenaud
47538071d3 Suggest dependencies needed by PHPExcel 2014-10-01 14:40:38 +02:00
Raphaël Doursenaud
769d824e7b Allow reporting progress along with timespent 2014-10-01 14:12:47 +02:00
BadPixxel
f178aa65ca removed "thumb\" subdir addition 
Category Image Thumb sub-folder now directly added by function liste_photos
 2014-09-30 19:43:21 +02:00
BadPixxel
d6c8f65dad Minor BugFix : Missing thumbs folder in Category Images List 
Sub-folder for thumbs was missing in category image list, url was wrong....
 2014-09-30 19:37:13 +02:00
BadPixxel
cf2ba78fc1 Missing Key for getNomUrl function 2014-09-30 19:11:01 +02:00
BadPixxel
12e6d1bf6c Missing Key for getNomUrl function 2014-09-30 19:09:59 +02:00
BadPixxel
820e6e5d95 Minor BugFix : Compatibility of function getNomUrl 
Using Ref & Label for Category Name display is necessary for compatibility
 2014-09-30 19:01:43 +02:00
Maxime Kohlhaas
920c9c7251 Fix : tva not coming from multiprice 2014-09-30 17:36:01 +02:00
BadPixxel
f3eec7582e Minor BugFix : Wrong variable reference in getNomUrl 
Display of Category Url was incompete due to reference to "$ref" instead of "$label"
 2014-09-30 16:00:04 +02:00
Xebax
11b3b94e6f Fix bug #1604: When a member is created, the birthday is not recorded. 2014-09-30 01:37:36 +02:00
Regis Houssin
f0551fe6d2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-29 20:43:34 +02:00
Regis Houssin
ba95251ea2 Fix: uniformize code 2014-09-29 20:43:20 +02:00
Laurent Destailleur
bbf07641ed Fix: checkstyle 2014-09-29 20:39:19 +02:00
Drosis Nikos
8c6ce79d9d Fix Lang for Payment Type 2014-09-29 18:15:09 +03:00
Laurent Destailleur
ec2a8b5551 Merge pull request #1800 from Devensys/Develop-HighlitingIBAN 
Highliting IBAN (sepa)
 2014-09-29 16:43:22 +02:00
Laurent Destailleur
8121aeb0b6 Merge pull request #1914 from aternatik/fix_ldapgrp 
Fix: gidNumber ldap attribute was not defined
 2014-09-29 16:39:36 +02:00
Laurent Destailleur
e35135d5b1 Merge branch 'develop-accounting' of github.com:aspangaro/dolibarr into 
develop

Conflicts:
	htdocs/compta/ventilation/card.php
	htdocs/compta/ventilation/fournisseur/card.php
	htdocs/compta/ventilation/fournisseur/list.php
	htdocs/compta/ventilation/list.php
	htdocs/core/menus/init_menu_auguria.sql
 2014-09-29 16:31:35 +02:00
Florian HENRY
056e3ec2af Fix travis (strange I didn't update this file) 2014-09-29 16:24:45 +02:00
Laurent Destailleur
cb302c16e7 Bad place of code 2014-09-29 16:22:00 +02:00
Laurent Destailleur
2ae776e51b Merge pull request #1915 from FHenry/3.6 
add ref_ext into fetch product and add hook into supplier card
 2014-09-29 16:02:48 +02:00
Florian HENRY
46f673fb5f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/fourn/card.php
 2014-09-29 16:01:49 +02:00
Florian HENRY
c7d02aa1df Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-09-29 15:56:59 +02:00
Laurent Destailleur
c6fc07e412 Merge pull request #1926 from fmarcet/3.6 
Fix: Withdrawal total amount is double
 2014-09-29 15:41:59 +02:00
Laurent Destailleur
ba33f73767 Merge pull request #1925 from tiaris/develop 
adding hooks for supplier card and order card
 2014-09-29 15:40:31 +02:00
Laurent Destailleur
78de38d0db Merge pull request #1923 from GPCsolutions/fixws 
Fixed invoices webservice
 2014-09-29 15:39:19 +02:00
Laurent Destailleur
a155fc71e2 Merge pull request #1928 from FHenry/3.6_fixwebservice 
3.6 fixwebservice
 2014-09-29 15:36:40 +02:00
Raphaël Doursenaud
f01e76f686 Removed unmaintaned OScommerce module 2014-09-29 15:22:48 +02:00
Regis Houssin
3d82f0965e Fix: Try to filter by context, use the test with $currentcontext in 
method for avoid to run twice (I have not found any other solution!)
 2014-09-29 15:20:54 +02:00
Regis Houssin
334cdf7dca Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-29 14:41:17 +02:00
Regis Houssin
c5a7dfbabb Fix: Add current context for avoid method execution in bad context, you 
can add this test in your method : eg if($currentcontext != 'formfile')
return;
 2014-09-29 14:40:02 +02:00
Laurent Destailleur
e0aa140960 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-29 14:01:40 +02:00