Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 03:28:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
36,922 Commits 36 Branches 190 Tags
a6233a738c2f67e557b54b144066a7cb15c728e8
Commit Graph

3946 Commits

Author SHA1 Message Date
Laurent Destailleur
37b94e43c8 Merge pull request #685 from frederic34/develop 
WIP : Admin for Carriers
 2013-02-23 03:11:52 -08:00
Laurent Destailleur
bbe145cc47 Merge pull request #681 from grandoc/develop 
english standardization
 2013-02-23 03:08:56 -08:00
Laurent Destailleur
845e4ff93d Merge pull request #684 from jfefe/develop 
Fix bug #732 : Missing argument when calling selectcontacts method
 2013-02-23 02:55:46 -08:00
Grand Philippe
182fdbce32 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-23 10:04:31 +01:00
Laurent Destailleur
1224e79ee3 Qual: Start to clean how menu managers works. 2013-02-22 19:16:03 +01:00
Grand Philippe
a0df6764d8 english standardization 2013-02-22 17:13:11 +01:00
Grand Philippe
844433d0a2 english standardization 2013-02-22 17:11:53 +01:00
jfefe
34bfdf92cd Fix bug #732 : Missing argument when calling selectcontacts method 2013-02-22 15:34:20 +01:00
Maxime Kohlhaas
04e1be4afd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-02-22 15:24:49 +01:00
Maxime Kohlhaas
87dc3a0b22 LDAP sync : trigger was launched even if LDAP_SYNCHRO_ACTIVE is 'ldap2dolibarr' 2013-02-22 15:24:29 +01:00
fhenry
af6bb94ff3 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-02-22 15:02:33 +01:00
fhenry
44b5b98308 Fix [ bug #733 ] 2013-02-22 15:02:06 +01:00
Laurent Destailleur
8c4e13230b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-02-22 14:20:46 +01:00
philippe
b4e43bbc41 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2013-02-22 13:58:19 +01:00
Regis Houssin
b5d2a378fa Fix: pdf models are unstable and time consuming. 2013-02-22 13:14:54 +01:00
Regis Houssin
7d0f02eb8b Fix: pdf models are unstable and time consuming. 2013-02-22 13:14:04 +01:00
Laurent Destailleur
a1b05f8be4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-02-22 13:02:15 +01:00
Regis Houssin
8a5f68de9c Fix: wrong hidden 2013-02-22 12:22:28 +01:00
Regis Houssin
dd7411593e Fix: wrong hidden 2013-02-22 12:21:49 +01:00
Laurent Destailleur
327f4062c7 New: Prepare code to be able to choose bank account to show when 
building pdf and payment mode is withdraw.
 2013-02-22 12:04:38 +01:00
philippe
fae9f73ea4 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2013-02-22 11:31:52 +01:00
Regis Houssin
3b45cffafa Fix: hide blocs with multi-page 2013-02-22 11:26:23 +01:00
Regis Houssin
8136244d87 Fix: hide blocs with multi-page 2013-02-22 11:25:29 +01:00
Regis Houssin
20522148f2 Fix: regression, the product discount overwrites the default customer 
discount !
 2013-02-22 11:06:45 +01:00
Regis Houssin
289ff4fe1a Fix: regression, the product discount overwrites the default customer 
discount !
 2013-02-22 11:03:20 +01:00
Grand Philippe
d229d3a594 english standardization 2013-02-22 09:41:56 +01:00
frederic34
de4bc7f39d Fix : It was a bad idea to add COL in the code name of new carriers 2013-02-22 08:56:14 +01:00
frederic34
6259f4ce59 Fix : some & -> & 2013-02-21 23:08:58 +01:00
Laurent Destailleur
0aa24369fd Merge pull request #676 from frederic34/develop 
New: Add some carrier
 2013-02-21 12:44:30 -08:00
Laurent Destailleur
c24b29343a Merge pull request #674 from simnandez/develop 
Qual: Try to delete no more used addpropal.php
 2013-02-21 12:39:47 -08:00
eldy
3d80a6ebfc Fix: Enhance pgsql driver 2013-02-21 21:04:20 +01:00
simnandez
5d357c7736 Trad: Fix activity box translation 2013-02-21 18:48:56 +01:00
frederic34
d7f83c3520 New: Add some carrier 2013-02-21 11:23:12 +01:00
Laurent Destailleur
2852aded3a New: Add button collapse/expand for menu, category and user views. 2013-02-20 21:16:31 +01:00
Laurent Destailleur
320b4bde1f Qual: Code to output tree is now generic 2013-02-20 19:01:29 +01:00
Laurent Destailleur
6db881c09d New: Add link collapse all - expand all. 
Fix: Add missing images.
 2013-02-20 18:34:54 +01:00
Laurent Destailleur
2017815e89 Fix: Works for both normalized modules and external modules 2013-02-20 17:34:03 +01:00
Laurent Destailleur
1aee361ffd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-02-20 14:58:56 +01:00
Laurent Destailleur
f194ee5363 Fix: core dir of external modules must be into dir of module. 2013-02-20 14:58:40 +01:00
Laurent Destailleur
e5e4c113a3 Merge pull request #672 from jfefe/extrafields 
Fix : extrafields value in ODT document
 2013-02-20 03:05:54 -08:00
jfefe
1941efa45a Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into webservices 2013-02-20 11:15:15 +01:00
Laurent Destailleur
d07c5ae49f Merge pull request #669 from simnandez/develop 
Fix: Translation
 2013-02-19 12:11:06 -08:00
Laurent Destailleur
9ddd6215f8 Qual: Replace native code with jquery plugin treeview. 2013-02-19 20:15:30 +01:00
simnandez
94d1f6e0c2 Fix: sourcecompany now works with state instead departement (deprecated) 
into build_address
 2013-02-19 16:05:55 +01:00
simnandez
9e3497cff3 New: Add ES formated address country rule 2013-02-19 16:02:58 +01:00
Laurent Destailleur
3912013a05 Merge pull request #668 from FHenry/develop 
Better to use foreach because when add mail in $cible array we can test
 2013-02-19 01:14:23 -08:00
fhenry
3e42f90b1e Better to use foreach because when add mail in $cible array we can test 
with (!array_key_exists($obj->email, $cibles)) better than old method
 2013-02-19 04:48:39 +01:00
Laurent Destailleur
4119fde0e5 Merge pull request #665 from FHenry/develop 
Fix mass mailing tabs regression
 2013-02-18 07:46:07 -08:00
jfefe
a197e6a026 Merge branch 'extra_odt' into extrafields 2013-02-18 15:50:47 +01:00
jfefe
110713f6ca Fix : display correct value in ODT for extrafields 2013-02-18 15:47:40 +01:00