lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,896 Commits 43 Branches 150 Tags 886 MiB
7cc548db31
Commit Graph

34896 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fhenry
7cc548db31 Force get list of extrafield even if external module manage extrafield 2013-01-21 13:52:59 +01:00
Laurent Destailleur
05bd489b82 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/admin/index.php
 2013-01-21 01:12:19 +01:00
Laurent Destailleur
e236ac3f03 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-01-21 01:07:22 +01:00
Laurent Destailleur
9cf405f9d2 Fix: syntax error 2013-01-21 01:06:52 +01:00
eldy
b3dbbe94e9 Missing div warning 
Conflicts:
	htdocs/admin/index.php
 2013-01-20 16:21:52 +01:00
eldy
4e8aaa99b5 Removed dead code 2013-01-20 15:41:39 +01:00
eldy
5fe1f38666 Missing div warning 2013-01-20 15:37:33 +01:00
eldy
5c49947750 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-20 15:32:48 +01:00
eldy
d1dc04761a Fix: dev rule to build portable requests 2013-01-20 15:30:51 +01:00
eldy
6ded74d5dd Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-01-20 15:22:14 +01:00
eldy
fc011610bb Fix: pgsql 2013-01-20 15:21:18 +01:00
jfefe
7a60bd0b3c Fix : missing class / bad user when create thirdparty with contact and 
user by webservice method
 2013-01-20 12:39:26 +01:00
Regis Houssin
a061f18900 Merge pull request #621 from jfefe/webservices 
Fix : missing class / bad user
 2013-01-20 03:20:25 -08:00
jfefe
1ab6fe6c21 Fix : missing class / bad user when create thirdparty with contact and 
user by webservice method
 2013-01-20 11:56:56 +01:00
Laurent Destailleur
5597e1b5c2 Protection to avoid not desired modules into packages 2013-01-19 18:47:35 +01:00
Laurent Destailleur
d411310651 Trad 2013-01-19 17:58:20 +01:00
Laurent Destailleur
2f3ed04023 Add info if session are encrypted 2013-01-19 17:56:26 +01:00
Laurent Destailleur
47c42943e8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-01-19 16:29:35 +01:00
Laurent Destailleur
abb6daf2dc Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/boxes/box_activity.php
 2013-01-19 16:29:16 +01:00
Laurent Destailleur
d65b69d16a Merge pull request #620 from simnandez/develop 
[ task #652 ] Reduce clicks into creaton of orders, invoices, etc.
 2013-01-19 07:22:12 -08:00
Laurent Destailleur
3551dff18a Fix: [ bug #671 ] Product country origin is automatically entered in 
description of invoices, but not in invoices generated from orders
 2013-01-19 15:57:28 +01:00
Laurent Destailleur
7002b328a8 Fix: [ bug #685 ] Supplier invoices should use encoding sequence number 
as secondary sorting field
 2013-01-19 15:32:03 +01:00
Laurent Destailleur
f701559056 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-01-19 14:32:50 +01:00
Laurent Destailleur
0e13b3872d Fix: Removed warnings 2013-01-19 14:32:37 +01:00
simnandez
f7e5edb0f8 [ task #652 ] Reduce clicks into creaton of orders, invoices, etc. 2013-01-19 10:45:57 +01:00
Laurent Destailleur
0e060cac11 Merge pull request #619 from FHenry/develop 
Update web service
 2013-01-18 09:39:13 -08:00
Laurent Destailleur
aaa56ce606 Merge pull request #618 from simnandez/3.3 
Fix: Bad Spanish departament name
 2013-01-18 09:30:45 -08:00
Laurent Destailleur
a5b174eccc Fix: Architecture of getCurrency was wrong. Cache was not stored 
correctly and dict file loaded several times. There was also bug on PHP
without mb_string function.
Now function is a method of $langs object. All bug fixes.
 2013-01-18 15:57:11 +01:00
Laurent Destailleur
060edf21da New: Add more PHPUnit tests to prepare removal of adodb. 2013-01-18 15:54:40 +01:00
Laurent Destailleur
591eab4826 Detect another problem into box. Just add a comment. 2013-01-18 14:22:18 +01:00
Laurent Destailleur
a12972034f Fix: Start to fix some bugs 2013-01-18 13:56:36 +01:00
Laurent Destailleur
3438b9fa62 Fix: init specimen 2013-01-18 12:32:10 +01:00
Laurent Destailleur
f650888ea6 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-18 12:17:21 +01:00
Laurent Destailleur
7c826dc38d Fix: Bad error management 2013-01-18 12:09:39 +01:00
Laurent Destailleur
57a869683d Fix date function 2013-01-18 11:28:06 +01:00
fhenry
e4b704f76d Update web service 2013-01-18 11:10:56 +01:00
Laurent Destailleur
abafd4f4ff Fix: separator was working only once. 2013-01-18 11:05:18 +01:00
simnandez
a57f291aa2 Fix: Bad Spanish departament name 2013-01-18 09:28:54 +01:00
Laurent Destailleur
34c5343103 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-01-17 20:56:28 +01:00
Laurent Destailleur
0c418160b9 Fix: exclude files 2013-01-17 20:56:13 +01:00
Laurent Destailleur
91f666bd90 Merge pull request #617 from FHenry/develop 
Fix bug on update thirdpartty webservice
 2013-01-17 11:28:35 -08:00
fhenry
685400c20e Fix bug on web service 2013-01-17 18:49:21 +01:00
Laurent Destailleur
6091f74b13 New: First changes to simplify/optimize menu management. 2013-01-17 18:39:15 +01:00
fhenry
9d5ab6daa0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-01-17 18:04:47 +01:00
fhenry
f665980ef0 Fix bug on update thirdpartty webservice 2013-01-17 18:03:10 +01:00
Laurent Destailleur
db54f5af44 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-17 18:02:51 +01:00
Laurent Destailleur
c16269d04e Fix: load at wrong place 
Conflicts:
	htdocs/core/class/html.formother.class.php
 2013-01-17 17:59:47 +01:00
Laurent Destailleur
9d5b36b27b Fix: error set on non object 2013-01-17 17:54:08 +01:00
Laurent Destailleur
b89b74e933 Fix: load at wrong place 2013-01-17 17:40:27 +01:00
Laurent Destailleur
66921cf24a Prepare 3.4 2013-01-17 13:19:17 +01:00