lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,715 Commits 43 Branches 150 Tags 886 MiB
8cb1818c4e
Commit Graph

42715 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
8cb1818c4e Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-11-08 14:59:02 +01:00
Laurent Destailleur
92cdef71e8 Fix: Graph report rubbish information. Better to have them as option. 2014-11-08 14:58:43 +01:00
Laurent Destailleur
c8b5288782 Merge pull request #2008 from ndrosis/patch-10 
Fix : The tva not coming from multi price for invoice
 2014-11-07 21:44:37 +01:00
Drosis Nikos
24439eb1a3 Fix : tva not coming from multiprice 2014-11-07 15:31:06 +02:00
Laurent Destailleur
4f08408065 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	ChangeLog
	htdocs/core/class/commonobject.class.php
 2014-11-05 16:28:44 +01:00
Laurent Destailleur
31c38cedbc Fix: checkstyle 2014-11-05 16:26:11 +01:00
Laurent Destailleur
606a3f9917 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-11-04 17:54:09 +01:00
Laurent Destailleur
45d57b0492 Merge pull request #1995 from atm-maxime/3.4 
Fix : actioncomme report was not filtering by entity...
 2014-11-04 17:41:40 +01:00
Laurent Destailleur
420de76b4b Merge pull request #1993 from aspangaro/3.6-patch 
GPLv3
 2014-11-04 17:40:38 +01:00
Laurent Destailleur
fd8d571d67 Merge pull request #2003 from atm-alexis/3.6 
fix bug on thm
 2014-11-04 17:36:17 +01:00
Alexis Algoud
d177a2fbb4 fix bug on thm 2014-11-04 16:13:51 +01:00
Laurent Destailleur
ca69bf9d7e Fix: Infinite loop 2014-11-02 21:20:24 +01:00
Laurent Destailleur
627f5694f0 Fix: Infinite loop 2014-11-02 21:19:00 +01:00
Laurent Destailleur
53dfda1413 Fix: Chars - is no more allowed into value for code for extra fields. 2014-11-01 19:34:20 +01:00
Maxime Kohlhaas
ccddf0d1be Fix : actioncomme report was not filtering by entity... 2014-10-31 16:56:14 +01:00
aspangaro
57f49ec5d4 GPLv3 2014-10-30 20:41:08 +01:00
Laurent Destailleur
e3041f45ee Update changelog 2014-10-30 18:08:42 +01:00
Laurent Destailleur
aac24c887f Merge pull request #1973 from jfefe/patch-6 
Avoid missing class error for fetch_thirdparty method
 2014-10-30 18:07:49 +01:00
Laurent Destailleur
e607a53ca3 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 
Conflicts:
	ChangeLog
 2014-10-30 17:53:38 +01:00
Laurent Destailleur
aac4609f2d Merge branch 'aspangaro-3.6-patch' into 3.6 2014-10-30 17:52:21 +01:00
Laurent Destailleur
5ec2c1c4b3 Merge branch '3.6-patch' of github.com:aspangaro/dolibarr into 
aspangaro-3.6-patch

Conflicts:
	ChangeLog
 2014-10-30 17:52:08 +01:00
Laurent Destailleur
bb72932601 Merge pull request #1985 from FHenry/3.6 
Fix extrafield from list feature where filter is provided
 2014-10-30 17:49:03 +01:00
Laurent Destailleur
2517d54196 Merge pull request #1989 from aternatik/fix_resource 
Missing translate key into resource module
 2014-10-30 17:32:02 +01:00
Laurent Destailleur
106b4a669f id_parent and id_children was not set. 
So introduce new method to return same with no risk to break current
working code to address this.
 2014-10-30 11:15:13 +01:00
jfefe
e370ffb2d4 Bad function call 2014-10-30 01:33:39 +01:00
jfefe
c5045a75d8 Missing trans key into resource module 2014-10-30 01:16:37 +01:00
Florian HENRY
834a6dc2af webservice Thirdparty parameter lastname for invidual creation is now 
lastname and not ref
 2014-10-28 16:50:44 +01:00
Florian HENRY
d846dd2431 Fix extrafield from list feature where filter is provided 2014-10-27 19:38:27 +01:00
Laurent Destailleur
badf379489 Fix: [ bug #1618 ] PHP Error thrown when saving a barcode 2014-10-27 01:56:06 +01:00
aspangaro
1405c03f7d Fix: Civility & birthdate wasn't save into adherent module 2014-10-26 06:48:08 +01:00
Laurent Destailleur
41f0920656 Fix for debian 2014-10-24 23:50:10 +02:00
jfefe
29db45c763 Avoid missing class error for fetch_thirdparty method 2014-10-23 01:15:05 +02:00
Laurent Destailleur
e78baab579 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-10-18 16:29:34 +02:00
Laurent Destailleur
48b2d818da Update changelog 2014-10-18 16:29:22 +02:00
Laurent Destailleur
1d0d3ab747 Merge pull request #1943 from ndrosis/patch-9 
Fix Error when trying to clone an Order
 2014-10-18 16:28:43 +02:00
Laurent Destailleur
3528049348 Merge pull request #1961 from FHenry/3.6 
Fix right and error management
 2014-10-18 14:15:13 +02:00
Florian HENRY
eeffe4ed34 Reload object when product clone failed (cause of ref already exists) if 
not done result is blanck pages (header wannot be rewrite (location
herder index.php) around line 1542
 2014-10-16 13:57:07 +02:00
Laurent Destailleur
a94f7dc3ad Revert "Add function dolEscapeXML" 
This reverts commit 756b1d31ad.
 2014-10-16 01:21:33 +02:00
Laurent Destailleur
efa171819a Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-10-16 01:19:33 +02:00
Laurent Destailleur
756b1d31ad Add function dolEscapeXML 2014-10-16 01:01:30 +02:00
Florian HENRY
722f6e0db6 Fix right on product list 2014-10-15 15:24:31 +02:00
Regis Houssin
104592b349 Fix: wrong function name 2014-10-12 19:08:34 +02:00
Laurent Destailleur
455bae98ef Fix: box of customer and propsects were not correctly disabled. 2014-10-12 15:49:29 +02:00
Laurent Destailleur
30e27014b8 Fix: box of customer and propsects were not correctly disabled. 2014-10-12 15:49:14 +02:00
Laurent Destailleur
5c07df812d Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-10-12 15:24:33 +02:00
Laurent Destailleur
cbbe909bc5 Fix: Pb in management of "or" ("|") for permission check. 2014-10-12 15:22:07 +02:00
Laurent Destailleur
c5d8012eb1 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/core/lib/date.lib.php
 2014-10-12 02:13:38 +02:00
Laurent Destailleur
797ab8a150 Merge pull request #1940 from aternatik/fix-cron 
Missing reprogramming task into GUI for cron module.
 2014-10-12 02:10:09 +02:00
Laurent Destailleur
c30f13a03d Fix: label of input method not translated. 2014-10-12 02:07:50 +02:00
Laurent Destailleur
ac2ff5c604 Update logs 2014-10-12 01:40:18 +02:00