Maxime Kohlhaas
|
e26d45539b
|
Merge branch '3.5' of github.com:Dolibarr/dolibarr into develop
|
2013-11-29 12:05:10 +01:00 |
|
Maxime Kohlhaas
|
f6aa04d5ef
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
|
2013-11-29 12:04:05 +01:00 |
|
Laurent Destailleur
|
e27d109f2d
|
Merge pull request #1328 from csalvador/develop-fixAJAX
Develop fix ajax
|
2013-11-29 02:59:11 -08:00 |
|
Laurent Destailleur
|
b3ff58e864
|
Merge pull request #1330 from grandoc/3.5
fix management of all errors message
|
2013-11-29 02:58:21 -08:00 |
|
Laurent Destailleur
|
ecd14cb751
|
Merge pull request #1326 from grandoc/3.5
3.5
|
2013-11-29 02:58:06 -08:00 |
|
Grand Philippe
|
d024ec3daa
|
fix management of all errors message
|
2013-11-29 11:29:39 +01:00 |
|
Grand Philippe
|
438d7b0fb2
|
fix regression
|
2013-11-29 11:04:22 +01:00 |
|
Grand Philippe
|
c0650d6da3
|
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5
|
2013-11-29 08:30:46 +01:00 |
|
Laurent Destailleur
|
a0c0578863
|
No need to send email for each error. First one is enough.
|
2013-11-28 19:06:34 +01:00 |
|
Laurent Destailleur
|
ea51e9ec77
|
Merge remote-tracking branch 'origin/3.5' into develop
|
2013-11-28 18:57:43 +01:00 |
|
Laurent Destailleur
|
d0b05bb5af
|
Fix: Restore style code lost by a commit.
|
2013-11-28 18:55:36 +01:00 |
|
Laurent Destailleur
|
5715e9c986
|
Merge remote-tracking branch 'origin/3.5' into develop
|
2013-11-28 17:06:11 +01:00 |
|
Laurent Destailleur
|
d1e62bebf0
|
Fix: Removed a merged that we ddidn't want.
|
2013-11-28 17:01:37 +01:00 |
|
Grand Philippe
|
5b2f9af7dc
|
fix management of all errors messages
|
2013-11-28 16:44:57 +01:00 |
|
Grand Philippe
|
1ac5bd3f28
|
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5
|
2013-11-28 16:39:29 +01:00 |
|
Laurent Destailleur
|
bdf8100d84
|
Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
htdocs/core/lib/agenda.lib.php
htdocs/product/stats/commande_fournisseur.php
|
2013-11-28 15:54:12 +01:00 |
|
Cédric Salvador
|
ec3fc4e6e6
|
indentation
|
2013-11-28 15:53:28 +01:00 |
|
Cédric Salvador
|
2da88a2966
|
made getVATRates synchronous to avoid concurrency problems
|
2013-11-28 15:52:26 +01:00 |
|
philippe
|
d5606b6045
|
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
|
2013-11-28 15:09:16 +01:00 |
|
Laurent Destailleur
|
a3e55822a4
|
Missing translation
|
2013-11-28 14:36:13 +01:00 |
|
Grand Philippe
|
1fc50c137b
|
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5
|
2013-11-28 14:25:42 +01:00 |
|
Grand Philippe
|
c88bb553bd
|
fix wrong example path
|
2013-11-28 14:25:11 +01:00 |
|
Laurent Destailleur
|
88ae0a7945
|
Fix: the rename function is bugged with some windows. I add a
workaround.
Fix: Add also a workaround for [ bug 1064 ] Date/Time in ICS incorrect.
|
2013-11-28 12:58:02 +01:00 |
|
Laurent Destailleur
|
894e6a296f
|
Merge pull request #1324 from FHenry/3.4
Fix [ bug #1156 ] Update TVA mass update tools do not work
|
2013-11-27 16:09:35 -08:00 |
|
Laurent Destailleur
|
74d6698f7d
|
Merge pull request #1325 from FHenry/3.5
[ bug #1153 ] SQL Error on the VAT main screen (with pgsql)
|
2013-11-27 16:08:02 -08:00 |
|
Florian Henry
|
5f8e896e0c
|
Fix [ bug #1154 ] Error when closing a service in a contract (pgsql)
|
2013-11-27 22:58:49 +01:00 |
|
Florian Henry
|
afc729c694
|
[ bug #1153 ] SQL Error on the VAT main screen (with pgsql)
|
2013-11-27 22:49:54 +01:00 |
|
Florian Henry
|
2178ab6007
|
Fix [ bug #1156 ] Update TVA mass update tools do not work
|
2013-11-27 22:05:29 +01:00 |
|
Laurent Destailleur
|
cd5f2b8239
|
Add tool to make stress tests
|
2013-11-27 20:00:18 +01:00 |
|
Laurent Destailleur
|
89f32bf46e
|
Update doc
|
2013-11-27 18:45:04 +01:00 |
|
Laurent Destailleur
|
c3af8b6b29
|
Sync from transifex
|
2013-11-27 14:59:02 +01:00 |
|
Laurent Destailleur
|
02837e0029
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2013-11-27 13:38:16 +01:00 |
|
Laurent Destailleur
|
8981f506dc
|
Fix: typo
|
2013-11-27 13:28:06 +01:00 |
|
Laurent Destailleur
|
b71406f12d
|
Merge pull request #1322 from aspangaro/develop
Improvement of the Skype button
|
2013-11-26 07:29:37 -08:00 |
|
Laurent Destailleur
|
6729f03ee6
|
Merge pull request #1323 from grandoc/3.5
fix language and standardize code
|
2013-11-26 07:28:30 -08:00 |
|
Laurent Destailleur
|
0383dc4706
|
Fix: 2 bugs during validation of a member
|
2013-11-26 13:10:00 +01:00 |
|
Laurent Destailleur
|
7ea595fa6d
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
|
2013-11-26 13:05:07 +01:00 |
|
Laurent Destailleur
|
854cfc741e
|
Fix: 2 bugs during validation of a member
|
2013-11-26 13:04:15 +01:00 |
|
Laurent Destailleur
|
01f3ba81af
|
Update doc
|
2013-11-25 21:19:57 +01:00 |
|
Laurent Destailleur
|
18ed9d5ca7
|
Fix: Filter on accountancy report were lost when using "print" view.
|
2013-11-25 16:51:30 +01:00 |
|
Grand Philippe
|
e8e5f4d943
|
missing trad
|
2013-11-25 13:55:01 +01:00 |
|
Grand Philippe
|
203a98d4ae
|
fix language and standardize code
|
2013-11-25 10:30:02 +01:00 |
|
aspangaro
|
e1b4d01235
|
Improvement of the Skype button
Perm & add a button"Chat"
|
2013-11-24 21:28:15 +01:00 |
|
Laurent Destailleur
|
216e9b390d
|
Merge pull request #1321 from FHenry/3.4
Fix [ bug #1145 ] Agenda button list type do not display
|
2013-11-24 12:16:27 -08:00 |
|
Laurent Destailleur
|
4cf2e2503c
|
Merge pull request #1320 from grandoc/3.5
3.5
|
2013-11-24 12:13:48 -08:00 |
|
Laurent Destailleur
|
baebc7e91d
|
Fix: Not coherent filename
|
2013-11-24 19:33:22 +01:00 |
|
Florian Henry
|
f1d0879419
|
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
|
2013-11-24 18:07:47 +01:00 |
|
Florian Henry
|
8f9143cef7
|
revert param_ihm
|
2013-11-24 18:07:40 +01:00 |
|
aspangaro
|
f98ec89dec
|
Merge branch 'upstream/3.5'
|
2013-11-24 17:25:20 +01:00 |
|
Grand Philippe
|
fae27842b7
|
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5
|
2013-11-24 14:50:07 +01:00 |
|