lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,656 Commits 43 Branches 150 Tags 886 MiB
cdb521663e
Commit Graph

35656 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Grand Philippe
38480f5962 english standardization 2013-02-22 16:19:16 +01:00
Grand Philippe
a582fd3f15 english standardization 2013-02-22 16:14:52 +01:00
jfefe
7e79e1a574 Fix bug #735 : Error when trying send expedition card 2013-02-22 16:02:19 +01:00
Grand Philippe
fc4ad12a72 english standardization 2013-02-22 15:57:30 +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
frederic34
67c06225a5 WIP : Admin for carriers 2013-02-22 14:18:51 +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
ae154ed9a3 Merge branch '3.3' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.3 2013-02-22 13:15:41 +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
Laurent Destailleur
6b50ddf6ec Merge pull request #682 from FHenry/3.3 
Fix bug #730
 2013-02-22 03:45:32 -08: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
Grand Philippe
960c9ccbaf english standardization 2013-02-22 11:39:47 +01:00
Grand Philippe
19201a1015 english standardization 2013-02-22 11:32:19 +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
d255dc5114 english standardization 2013-02-22 10:24:24 +01:00
philippe
e84524555c Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2013-02-22 09:45:58 +01:00
Laurent Destailleur
c4c5e247af Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-02-22 09:44:17 +01:00
Laurent Destailleur
a17b6c6d0d Doc 2013-02-22 09:44:05 +01:00
fhenry
aa473fa3e3 Fix bug #730 2013-02-22 09:42:02 +01:00
Grand Philippe
d229d3a594 english standardization 2013-02-22 09:41:56 +01:00
Grand Philippe
303577a7fa english standardization 2013-02-22 09:36:01 +01:00
Grand Philippe
0af5c434af english standardization 2013-02-22 09:29:34 +01:00
Laurent Destailleur
50ba240873 Merge pull request #680 from simnandez/develop 
Fix: Pagination at bottom not work correctly with filters applied
 2013-02-22 00:23:07 -08:00
frederic34
751488e291 Merge remote-tracking branch 'upstream/develop' into develop 2013-02-22 09:01:27 +01:00
simnandez
e1683f5f22 Fix: Pagination at bottom not work correctly with filters applied 2013-02-22 08:57:28 +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
simnandez
8fd3d9375d Fix: Pagination at bottom not work correctly with filters applied 2013-02-22 08:56:07 +01:00
eldy
4f1c4f0365 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-02-22 00:11:47 +01:00
eldy
2ecb113d30 Fix: categories are set onto category tab 2013-02-22 00:11:34 +01:00
frederic34
d26024d8fc WIP : Admin for Carriers (Activate/Desactivate) 2013-02-21 23:40:25 +01:00
frederic34
6259f4ce59 Fix : some & -> & 2013-02-21 23:08:58 +01:00
Laurent Destailleur
66debfe19e Merge pull request #656 from polto/fgd 
Fix : bad method name for prospect status
 2013-02-21 12:45:29 -08:00
Laurent Destailleur
fbff66a907 Merge pull request #677 from simnandez/3.3 
Fix: Pagination at bottom not work correctly with filters applied
 2013-02-21 12:44:56 -08:00
Laurent Destailleur
4a8883dc92 Merge pull request #678 from atm-maxime/develop 
Supplier order : add trigger on product dispatch
 2013-02-21 12:44:43 -08: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
3053319928 Merge pull request #675 from grandoc/develop 
fix : english normalization
 2013-02-21 12:40:15 -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