Juanjo Menent
|
c13d2d202b
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
|
2015-09-08 21:08:59 +02:00 |
|
Laurent Destailleur
|
1f44bb5947
|
Merge pull request #3495 from FHenry/3.7
FIX : multientity warehouse management
|
2015-09-08 20:58:48 +02:00 |
|
Juanjo Menent
|
355fcc78cf
|
Fix #3475 RemiseCheque: Undefined variable $date
|
2015-09-08 20:48:31 +02:00 |
|
Florian HENRY
|
89b723b2a7
|
FIX : multientity warehouse management
|
2015-09-08 16:23:00 +02:00 |
|
Laurent Destailleur
|
e5ad14442a
|
Merge pull request #3472 from aspangaro/3.7-5
Fix #3455 In advanced accounting module, button transfer to general ledger don't work
|
2015-09-07 15:10:20 +02:00 |
|
Laurent Destailleur
|
6c78b930d1
|
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
|
2015-09-06 11:26:20 +02:00 |
|
aspangaro
|
a4a72d64c0
|
New: Accountancy Add message when general ledger is witten
|
2015-09-06 06:43:40 +02:00 |
|
aspangaro
|
b268ccf064
|
Fix #3455 In advanced accounting module, button transfer to general ledger don't work
|
2015-09-06 04:52:03 +02:00 |
|
Laurent Destailleur
|
8076ea85ea
|
3.6.4 was packaged
|
2015-09-05 20:07:17 +02:00 |
|
Juanjo Menent
|
ecf80249d1
|
Merge pull request #3454 from hregis/3.7_bug3
Fix: problem with pagination
|
2015-09-04 18:22:23 +02:00 |
|
Juanjo Menent
|
0016f48fac
|
Merge pull request #3424 from atm-aurelien/3.7
FIX ref_supplier to object property on supplier ref change
|
2015-09-04 18:00:05 +02:00 |
|
Laurent Destailleur
|
2e3d25c055
|
Merge pull request #3462 from grandoc/3.7
fix : Typo
|
2015-09-03 19:15:31 +02:00 |
|
Laurent Destailleur
|
1f25ccf0bf
|
git push origin 3.7Merge branch 'marcosgdf-bug-3460' into 3.7
|
2015-09-03 19:14:49 +02:00 |
|
Laurent Destailleur
|
c7b7dff0ed
|
Merge branch 'bug-3460' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-3460
Conflicts:
ChangeLog
|
2015-09-03 19:14:37 +02:00 |
|
Laurent Destailleur
|
846899dc06
|
git push origin 3.7Merge branch 'marcosgdf-bug-3383' into 3.7
|
2015-09-03 19:12:43 +02:00 |
|
Laurent Destailleur
|
54214cfddf
|
Merge branch 'bug-3383' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-3383
Conflicts:
ChangeLog
|
2015-09-03 19:12:01 +02:00 |
|
Laurent Destailleur
|
7009c6b890
|
git push origin 3.7Merge branch 'marcosgdf-bug-3358' into 3.7
|
2015-09-03 19:08:19 +02:00 |
|
Laurent Destailleur
|
be9d5b030d
|
Merge branch 'bug-3358' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-3358
Conflicts:
ChangeLog
|
2015-09-03 19:08:08 +02:00 |
|
Laurent Destailleur
|
b0f604da14
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
Conflicts:
ChangeLog
|
2015-09-03 17:05:02 +02:00 |
|
Laurent Destailleur
|
de741e41e5
|
git push origin 3.7Merge branch 'marcosgdf-bug-incorrect-pdf-bank' into 3.7
|
2015-09-03 17:04:03 +02:00 |
|
Laurent Destailleur
|
bd38e2f0bd
|
Merge pull request #3457 from marcosgdf/bug-iban-whitespaces-37
FIX [ bug #3432 ] Spaces should be removed from IBAN when formatting it
|
2015-09-03 16:56:15 +02:00 |
|
Laurent Destailleur
|
51a01921ba
|
Merge pull request #3456 from marcosgdf/bug-2893
Fix [ bug #2893 ] Dolibarr error when viewing an invoice after changing invoice mask
|
2015-09-03 16:55:13 +02:00 |
|
philippe grand
|
fed70b1376
|
translation missing
|
2015-09-03 12:57:57 +02:00 |
|
Marcos García de La Fuente
|
ded6e7d6d9
|
Merge branch '3.7' into bug-3358
# Conflicts:
# ChangeLog
|
2015-09-03 12:32:03 +02:00 |
|
Marcos García de La Fuente
|
2d5331b8f8
|
FIX [ #3460 ] Selected bank account was not saved when an error happened when trying to create a customer invoice
Close #3460
|
2015-09-03 12:13:03 +02:00 |
|
philippe grand
|
8bf093a7ce
|
fix : Typo
|
2015-09-03 12:12:10 +02:00 |
|
Marcos García de La Fuente
|
67b7162c59
|
Merge branch '3.7' into bug-3383
# Conflicts:
# ChangeLog
|
2015-09-03 12:05:19 +02:00 |
|
Marcos García de La Fuente
|
86dd751f29
|
Merge branch '3.7' into bug-incorrect-pdf-bank
# Conflicts:
# ChangeLog
|
2015-09-03 12:03:24 +02:00 |
|
Marcos García de La Fuente
|
0955432de3
|
Merge branch '3.7' into bug-iban-whitespaces-37
# Conflicts:
# ChangeLog
|
2015-09-03 12:02:23 +02:00 |
|
Marcos García de La Fuente
|
7a115c9366
|
Typo
|
2015-09-03 11:59:46 +02:00 |
|
Marcos García de La Fuente
|
bd21cf5d68
|
Updated changelog
|
2015-09-03 11:58:20 +02:00 |
|
Marcos García de La Fuente
|
08565d46fe
|
Merge branch '3.6' into bug-2893
|
2015-09-03 11:56:43 +02:00 |
|
Marcos García de La Fuente
|
50184babb9
|
FIX [ bug #2893 ] Dolibarr error when viewing an invoice after changing invoice mask
Close #2893
|
2015-09-03 11:55:40 +02:00 |
|
Laurent Destailleur
|
d64a87d980
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/compta/index.php
|
2015-09-03 10:44:40 +02:00 |
|
Laurent Destailleur
|
001f1b4c31
|
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/filefunc.inc.php
|
2015-09-03 10:41:44 +02:00 |
|
Laurent Destailleur
|
7640abe6fc
|
Merge pull request #3453 from hregis/3.7_bug
Fix: wrong logical operator
|
2015-09-03 10:40:10 +02:00 |
|
Laurent Destailleur
|
897686a752
|
Merge pull request #3447 from fmarcet/3.5
FIX: The hours of date filter aren't correct
|
2015-09-03 10:33:00 +02:00 |
|
Laurent Destailleur
|
6ea31d87f8
|
Merge pull request #3445 from GPCsolutions/3.7-2863
Fix #2863 Sensible defaults for ChromePHP path
|
2015-09-03 10:32:22 +02:00 |
|
Laurent Destailleur
|
9efecbf52b
|
Merge pull request #3443 from GPCsolutions/3.5-3442
Fix #3442 Remove useless syslog
|
2015-09-03 10:30:42 +02:00 |
|
Laurent Destailleur
|
e3d4b104e2
|
Merge pull request #3449 from GPCsolutions/3.5-3448
Fix #3448 Pass expected date format
|
2015-09-03 10:26:00 +02:00 |
|
Laurent Destailleur
|
c024578ca1
|
Fix bad link and remove a break
|
2015-09-02 19:41:54 +02:00 |
|
Regis Houssin
|
1a08f65942
|
Fix: problem with pagination
|
2015-09-02 17:22:19 +02:00 |
|
Laurent Destailleur
|
5ef3c517bc
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2015-09-02 16:26:09 +02:00 |
|
Laurent Destailleur
|
c4fa4fc931
|
Fix hidden feature to send remind by email
|
2015-09-02 16:25:21 +02:00 |
|
Regis Houssin
|
fbf13ec2c7
|
Fix: wrong logical operator
|
2015-09-02 14:09:19 +02:00 |
|
Marcos García de La Fuente
|
216827b1d8
|
FIX [ bug #3358 ] Tasks box does not work with PostgreSQL
Close #358
|
2015-09-01 11:26:59 +02:00 |
|
Marcos García de La Fuente
|
3134950dbe
|
FIX [ bug #3383 ] Company name is overlapped with company direction in PDF models
Close #3383
|
2015-09-01 11:19:05 +02:00 |
|
Marcos García de La Fuente
|
c4f9bde14d
|
FIX [ bug #3431 ] Invoice bank account is not respected
Close #3431
|
2015-09-01 11:09:37 +02:00 |
|
Raphaël Doursenaud
|
870882257d
|
Fix #3448 Pass expected date format
|
2015-09-01 11:06:44 +02:00 |
|
Marcos García de La Fuente
|
9ec349f410
|
FIX [ bug #3432 ] Spaces should be removed from IBAN when formatting it
Close #3432
|
2015-09-01 10:56:55 +02:00 |
|