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

34791 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Regis Houssin
8a6bc63127 Fix: uniformize code 2013-01-15 11:23:24 +01:00
Regis Houssin
787d3bd6a9 Fix: use event method 2013-01-15 11:00:32 +01:00
Laurent Destailleur
3332709ba1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-01-14 16:51:38 +01:00
Regis Houssin
e06912dff3 Merge pull request #608 from FHenry/develop 
Add standard extrafield type : mail, phone, price
 2013-01-14 07:19:07 -08:00
fhenry
51098c1227 Add standard extrafield type : 
- mail
	- phone
	- price
 2013-01-14 16:13:09 +01:00
Laurent Destailleur
6942700ce7 New: Direct jump to edit page 2013-01-14 15:18:15 +01:00
Laurent Destailleur
e8ab24949a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-01-14 13:08:48 +01:00
Laurent Destailleur
6746e76564 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-01-14 12:24:06 +01:00
Regis Houssin
f954ff509c Merge pull request #607 from atm-maxime/develop 
Display bug on FF while closing proposal
 2013-01-14 03:22:11 -08:00
Maxime Kohlhaas
14dde75c4b Display bug on FF while closing proposal 2013-01-14 12:17:21 +01:00
Regis Houssin
c9e4da8533 Merge pull request #606 from atm-maxime/develop 
Multi-company compatibility with transverse mode
 2013-01-14 03:04:22 -08:00
Maxime Kohlhaas
6abf682faa Multi-company compatibility with transverse mode for pdf models 2013-01-14 12:01:44 +01:00
Laurent Destailleur
07ba988cf8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-01-14 11:45:16 +01:00
Laurent Destailleur
297c10d16b Qual: externalise code of merging PDFs into a library. 2013-01-14 11:39:30 +01:00
Maxime Kohlhaas
fb1d99d0dd Multi-company compatibility with transverse mode for home boxes 2013-01-14 11:09:10 +01:00
Regis Houssin
cf12815ca9 Fix: phpunit error 2013-01-14 09:39:35 +01:00
Laurent Destailleur
8b77005eae Merge pull request #605 from FHenry/develop 
remove dummy line
 2013-01-13 11:59:14 -08:00
fhenry
b9c53fd796 remove dummy line 2013-01-13 20:50:54 +01:00
Laurent Destailleur
ff24a7df67 New: Add script to detect DOS (non Linux) files. 2013-01-13 19:34:43 +01:00
Laurent Destailleur
29e6d01e51 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2013-01-13 19:33:54 +01:00
Laurent Destailleur
0f6506d457 Fix: not object error with option SERVICE_ARE_ECOMMERCE_200238EC 2013-01-13 18:57:55 +01:00
Laurent Destailleur
8ff12f7d55 Merge pull request #604 from simnandez/develop 
[ task #652 ] Reduce clicks into creaton of orders, invoices, etc.
 2013-01-13 07:01:28 -08:00
Laurent Destailleur
1d95c68a74 Update 2013 2013-01-13 14:38:05 +01:00
simnandez
ffbb611eb4 [ task #652 ] Reduce clicks into creaton of orders, invoices, etc. 2013-01-13 10:57:39 +01:00
simnandez
b1369a2f01 [ task #652 ] Reduce clicks into creaton of orders, invoices, etc. 2013-01-12 22:08:52 +01:00
Laurent Destailleur
980bfde83e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-01-12 19:59:09 +01:00
Laurent Destailleur
c9a6da610d To allow module to use ckeditor/config.js 2013-01-12 16:00:38 +01:00
Laurent Destailleur
1bed4aa193 Merge pull request #602 from FHenry/develop 
Add boolean (checkbox) standard extrafield feature
 2013-01-12 06:53:48 -08:00
Laurent Destailleur
8152dda733 Merge pull request #601 from simnandez/develop 
[ task #652 ] Reduce clicks into creaton of orders, invoices, etc.
 2013-01-12 06:45:34 -08:00
Laurent Destailleur
979ea42d3f Comments 2013-01-12 15:40:38 +01:00
Laurent Destailleur
054a9b7447 Merge pull request #600 from marcosgdf/test 
Added tests for Adherent class functions
 2013-01-12 06:36:14 -08:00
fhenry
2cdeb95b67 Set member id on create not by sql request after. 
Mandatory for trigger USER_CREATE to do action if user is member
 2013-01-12 15:16:38 +01:00
Laurent Destailleur
ec8b260bf6 New: Prepare 3.4 branch 
New: Add hook for agenda, info and category tabs
 2013-01-12 14:34:16 +01:00
Marcos García
aff96e5050 Added test for functions fetch_login and resiliate 2013-01-12 14:14:36 +01:00
fhenry
d39368fd36 Add boolean (checkbox) standard extrafield feature 2013-01-12 14:02:39 +01:00
simnandez
96c5eacf4a [ task #652 ] Reduce clicks into creaton of orders, invoices, etc. 2013-01-12 09:58:21 +01:00
Marcos García
729a8017c3 Added test for Adherent class functions setUserId and setThirdPartyId 2013-01-11 17:13:37 +01:00
Laurent Destailleur
351c4927f4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-01-11 16:18:47 +01:00
Laurent Destailleur
8d5dd719aa Add svg file 2013-01-11 16:11:35 +01:00
Laurent Destailleur
22dcb7ee6a Merge pull request #599 from cbattarel/develop 
show costprice instead of buyingprice if setup of margin module is costprice
 2013-01-11 06:50:58 -08:00
Laurent Destailleur
a30dd12cc0 Merge pull request #598 from cbattarel/3.3 
show costprice instead of buyingprice if setup of margin module is costprice
 2013-01-11 06:50:35 -08:00
Christophe Battarel
62ccb57857 fix missing td 2013-01-11 15:41:47 +01:00
Christophe Battarel
49703240f7 show costprice instead of buyingprice if setup of margin module is costprice 2013-01-11 15:39:11 +01:00
Christophe Battarel
38e9290729 show costprice instead of buyingprice if setup of margin module is costprice 2013-01-11 15:33:34 +01:00
Regis Houssin
ee0db5f67b Merge pull request #597 from FHenry/develop 
Update method in thirdparty web service
 2013-01-10 14:32:17 -08:00
fhenry
10ed8c141e Update method in thirdparty web service 2013-01-10 23:30:26 +01:00
Laurent Destailleur
37b6bab893 Fix: Missing lang loading 2013-01-10 22:45:55 +01:00
Laurent Destailleur
14dede1a74 Fix: Protection to avoid renaming a user with a login that already 
exists.
 2013-01-10 21:32:10 +01:00
Laurent Destailleur
049bf1ee00 Merge pull request #594 from marcosgdf/doc-typo 
Fixed typos in console message
 2013-01-10 12:14:24 -08:00
Laurent Destailleur
5b4f1d39be Merge pull request #591 from marcosgdf/test 
Improved AdherentTest and added testAdherentMakeSubstitution
 2013-01-10 12:13:53 -08:00