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

34983 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
0743049dc4 Fix: get list of currencies 2013-01-28 14:57:37 +01:00
Laurent Destailleur
c42a0c5b03 Fix: removed warning 2013-01-28 14:40:15 +01:00
Laurent Destailleur
0beea6c23c Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/install/inc.php
 2013-01-28 12:58:16 +01:00
Laurent Destailleur
f75248308d Merge remote-tracking branch 'origin/3.3' into develop 2013-01-28 12:50:12 +01:00
Laurent Destailleur
a8ccc0ab0b Fix: loghandler loaded twice. 2013-01-28 12:36:15 +01:00
Laurent Destailleur
db38c9baac Fix: loghandler loaded twice 2013-01-28 12:35:29 +01:00
Laurent Destailleur
b98151db94 Fix: A log handler can be loaded twice. 2013-01-28 12:22:12 +01:00
Laurent Destailleur
abd8aea06b Fix: Log not reported 
Fix: charset not correctly forced

Conflicts:
	htdocs/install/inc.php
 2013-01-28 11:56:45 +01:00
Laurent Destailleur
eeba48f9b0 Fix: Log not reported 
Fix: charset not correctly forced
 2013-01-28 11:43:49 +01:00
Laurent Destailleur
1b8634588f Fix: Missing property 2013-01-28 11:31:44 +01:00
Laurent Destailleur
dde8738999 Qual: Add a protection to detect bad usage of getStaticMember 2013-01-28 11:30:28 +01:00
Laurent Destailleur
2002388098 Revert "New: add hook getFormMail" 
This reverts commit c732532483.
 2013-01-26 13:40:31 +01:00
Regis Houssin
647cbb08fb Fix: wrong EOL 2013-01-26 10:38:11 +01:00
Regis Houssin
fcee35c65d Fix: $hookmanager is a global object 2013-01-26 10:35:30 +01:00
Laurent Destailleur
64cac3194c Fix: Use translation of NPR 2013-01-25 19:19:41 +01:00
Laurent Destailleur
56e11e52fa New: hookmanager class is used frequently and is a factory object, so we 
can move it during init of environment and use it globally.
 2013-01-25 19:12:54 +01:00
Laurent Destailleur
1cc949777f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-01-25 17:46:42 +01:00
Laurent Destailleur
c2d334624b Qual: Simplify system for menu manager. Only one file, one class per 
manager.
 2013-01-25 17:44:23 +01:00
Laurent Destailleur
2aa548560b doc: Update exemples 2013-01-25 16:52:23 +01:00
Regis Houssin
e3be718a57 Fix: wrong object name 2013-01-25 12:38:41 +01:00
Regis Houssin
7983b1dec5 Fix: wrong object name 2013-01-25 12:37:03 +01:00
Regis Houssin
7703438340 Merge pull request #630 from simnandez/develop 
Fix:  [ bug #698 ] Bad calculation of totals of associated documents
 2013-01-25 02:40:09 -08:00
simnandez
ad3645f7f4 Fix: [ bug #698 ] Bad calculation of totals of associated documents 2013-01-25 11:37:30 +01:00
Laurent Destailleur
70b21172f9 Qual: Removed not used and deprecated property 2013-01-25 11:05:44 +01:00
Maxime Kohlhaas
7facbf7aa2 Multicompany restriction for transverse mode not used anymore. RestrictedArea is enough 2013-01-24 18:12:29 +01:00
Regis Houssin
e86654bee7 Merge pull request #629 from atm-maxime/develop 
Multicompany restriction for transverse mode not used anymore. Restricte...
 2013-01-24 09:10:37 -08:00
Maxime Kohlhaas
8ab450f69b Multicompany restriction for transverse mode not used anymore. RestrictedArea is enough 2013-01-24 17:54:51 +01:00
Regis Houssin
6089ba614e Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2013-01-24 17:32:52 +01:00
Regis Houssin
b50a9415df Merge branch '3.3' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.3 2013-01-24 17:31:51 +01:00
Regis Houssin
c688e2afab New: add hook getFormMail 2013-01-24 17:31:22 +01:00
Regis Houssin
c732532483 New: add hook getFormMail 2013-01-24 17:29:11 +01:00
Laurent Destailleur
98ce66d8b7 Merge pull request #628 from simnandez/3.3 
Fix:  [ bug #698 ] Bad calculation of totals of associated documents
 2013-01-24 08:17:50 -08:00
simnandez
03d6903248 Fix: [ bug #698 ] Bad calculation of totals of associated documents 2013-01-24 12:53:42 +01:00
Laurent Destailleur
9f44161e55 New: Can attach file for trip and expenses module 2013-01-24 12:47:06 +01:00
Laurent Destailleur
8682d3c928 Fix: Note not visible 2013-01-24 12:16:00 +01:00
Laurent Destailleur
fa2e9cbd4f Exclude external modules 2013-01-24 10:06:39 +01:00
Laurent Destailleur
0db303ca59 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-23 23:35:39 +01:00
Laurent Destailleur
3472282703 Fix: [ bug #667 ] Customer categories wrong tree shown after update 
3.2->3.3
 2013-01-23 23:34:43 +01:00
Regis Houssin
efadc2c75c Fix: remove unused support 2013-01-23 21:04:41 +01:00
Regis Houssin
3155e92cb1 Merge pull request #627 from FHenry/develop 
Add SparkAngel Support for Open-concept.pro
 2013-01-23 11:55:28 -08:00
fhenry
848bb5417d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-01-23 19:46:44 +01:00
fhenry
7fcf206603 Add SparkAngel Support for Open-concept.pro 2013-01-23 19:46:28 +01:00
Laurent Destailleur
a7d41d74e8 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-23 18:09:05 +01:00
Laurent Destailleur
5e42a9ff8a Fix: Revert again another fix that was not correct. It was no more 
possible to edit a user even if user has permission for.
If module multicompany does not exists (standard mode), no
other test must be added to the if, except the $canxxx test.
 2013-01-23 18:08:11 +01:00
Laurent Destailleur
73380b181c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-01-23 17:35:57 +01:00
Regis Houssin
2726cb13d3 Merge pull request #626 from jfefe/webservices 
Webservices
 2013-01-23 08:29:32 -08:00
jfefe
9b28f98119 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into webservices 2013-01-23 16:39:49 +01:00
jfefe
c7df80a6b5 Add extrafields for webservice contact / missing fields 2013-01-23 16:34:21 +01:00
Regis Houssin
beea9c2ec4 Fix: use the users entity 2013-01-23 15:44:51 +01:00
Regis Houssin
9203cce485 Fix: use the users entity 2013-01-23 15:41:17 +01:00