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

42691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aspangaro
57f49ec5d4 GPLv3 2014-10-30 20:41:08 +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
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
Florian HENRY
722f6e0db6 Fix right on product list 2014-10-15 15:24:31 +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
Laurent Destailleur
3b6618b7f6 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-10-12 01:37:53 +02:00
Laurent Destailleur
dad1e312ab Merge pull request #1939 from atm-maxime/3.6 
Fix bug 1588 : relative discount
 2014-10-12 01:37:39 +02:00
Laurent Destailleur
c184253951 Update doc 2014-10-11 23:56:45 +02:00
Laurent Destailleur
fc63e8b9dc Fix: ErrorBadValueForParamNotAString error message in price customer 
multiprice
 2014-10-11 23:55:10 +02:00
Maxime Kohlhaas
ec974cae26 Merge branch '3.6' of github.com:atm-maxime/dolibarr into 3.6 2014-10-09 13:59:27 +02:00
Maxime Kohlhaas
4fd67d725a Fix bug 1588 : relative discount not working anymore 2014-10-09 13:58:43 +02:00
Drosis Nikos
0c7cabbf37 Fix Error when trying to clone an Order 2014-10-06 16:15:11 +03:00
jfefe
fdbf2fb45d Missing reprogramming task into GUI for cron module. 
Without this, a new task is never executed (because without datenextrun defined)
 2014-10-06 13:28:07 +02:00
Maxime Kohlhaas
386f4bd82e Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6 2014-10-06 10:05:48 +02:00
Maxime Kohlhaas
48072c58d7 Fix bug 1588 : relative discount not working anymore 2014-10-06 10:05:27 +02:00
Regis Houssin
692881bf59 Fix: missing $ismultientitymanaged 2014-10-06 09:07:09 +02:00
Laurent Destailleur
c73f4a14ee Fix: Bad days returned by function 2014-10-05 16:17:09 +02:00
Laurent Destailleur
742d0e37ee Fix: Bad month return by function 2014-10-05 12:54:51 +02:00
Laurent Destailleur
d518278166 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture/class/facture.class.php
 2014-10-03 19:17:28 +02:00
Laurent Destailleur
05fe8e45b3 Exclude module dire from package 2014-10-03 19:07:49 +02:00
Laurent Destailleur
b85a835988 Prepare 3.6.1 2014-10-03 19:03:58 +02:00
Laurent Destailleur
a853aed348 Fix: Some fields not visibles. Wrong value for calculated time. 2014-10-03 03:42:11 +02:00
Laurent Destailleur
868809caba Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-10-03 03:22:37 +02:00
Laurent Destailleur
c69565fd69 Fix: column name should not be an numeric 2014-10-03 03:12:39 +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
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
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