Laurent Destailleur
|
c0d8bce2df
|
Prepare 3.8.5
|
2016-07-21 19:44:25 +02:00 |
|
Laurent Destailleur
|
25810ddfc8
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/compta/localtax/quadri_detail.php
htdocs/core/lib/tax.lib.php
|
2016-04-22 20:08:33 +02:00 |
|
Laurent Destailleur
|
68e96b98c5
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
|
2016-04-22 20:02:34 +02:00 |
|
Laurent Destailleur
|
7f5670cb26
|
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
ChangeLog
|
2016-04-22 19:49:27 +02:00 |
|
Regis Houssin
|
20d785ad28
|
Merge remote-tracking branch 'origin/3.7' into 3.8_fix_merge
Conflicts:
htdocs/filefunc.inc.php
|
2016-03-23 13:40:05 +01:00 |
|
Laurent Destailleur
|
731d1cfe41
|
Update changelog for 3.8.4
|
2016-03-12 12:07:11 +01:00 |
|
Laurent Destailleur
|
444fce0bd9
|
Prepare 3.7.4
|
2016-03-11 18:34:05 +01:00 |
|
Laurent Destailleur
|
e669dac398
|
Prepare 3.6.7
|
2016-03-11 18:28:39 +01:00 |
|
Laurent Destailleur
|
a45ffeecca
|
Missing changelog
|
2016-03-11 18:21:57 +01:00 |
|
Laurent Destailleur
|
8f0a004a58
|
Merge remote-tracking branch 'origin/3.7' into 3.8
|
2016-01-02 12:24:20 +01:00 |
|
Laurent Destailleur
|
e4640ca4c3
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/install/upgrade.php
|
2016-01-02 12:22:00 +01:00 |
|
Laurent Destailleur
|
a2e93056f7
|
Prepare 3.8.3
|
2015-12-27 23:42:09 +01:00 |
|
Laurent Destailleur
|
f13df0f952
|
Prepare 3.7.3
|
2015-12-27 20:17:46 +01:00 |
|
Laurent Destailleur
|
a2c8208541
|
Prepare 3.6.5
|
2015-12-27 19:17:05 +01:00 |
|
Laurent Destailleur
|
93be4305c4
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
build/makepack-dolibarr.pl
htdocs/accountancy/customer/card.php
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/card.php
htdocs/accountancy/supplier/list.php
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/fichinter/card.php
htdocs/societe/rib.php
|
2015-11-13 12:18:46 +01:00 |
|
Laurent Destailleur
|
eac80d7db4
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
ChangeLog
build/debian/changelog
htdocs/commande/fiche.php
htdocs/compta/facture.php
|
2015-11-13 11:43:29 +01:00 |
|
Laurent Destailleur
|
722a133b31
|
FIX Add a protection to not make release if ChangeLog was not generated.
Prepare package 3.6.5
Conflicts:
ChangeLog
Conflicts:
ChangeLog
|
2015-11-08 15:09:57 +01:00 |
|
Laurent Destailleur
|
9b8bb114cd
|
FIX Add a protection to not make release if ChangeLog was not generated.
Prepare package 3.7.2
Conflicts:
ChangeLog
|
2015-11-08 14:55:12 +01:00 |
|
Laurent Destailleur
|
c639e82062
|
FIX Add a protection to not make release if ChangeLog was not generated.
Conflicts:
ChangeLog
|
2015-11-08 14:45:56 +01:00 |
|
Laurent Destailleur
|
6b98c50510
|
FIX Add a protection to not make release if ChangeLog was not generated.
|
2015-11-08 12:16:30 +01:00 |
|
Laurent Destailleur
|
972c364c37
|
FIX Add a protection to not make release if ChangeLog was not generated.
Prepare package 3.8.2
|
2015-11-08 12:12:28 +01:00 |
|
Laurent Destailleur
|
8a02c8288b
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/product/index.php
|
2015-10-16 09:56:55 +02:00 |
|
Laurent Destailleur
|
9b85a70013
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
|
2015-10-16 09:52:38 +02:00 |
|
Laurent Destailleur
|
df39a1054e
|
Fix 3.8.1
|
2015-10-11 20:19:52 +02:00 |
|
Laurent Destailleur
|
9fa2afb44b
|
Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6
Conflicts:
ChangeLog
|
2015-10-11 19:55:50 +02:00 |
|
Marcos García de La Fuente
|
fd9f51df88
|
Missing changelog
|
2015-10-11 12:39:42 +02:00 |
|
Marcos García de La Fuente
|
9f1fa7e212
|
Missing changelog
|
2015-10-11 12:32:02 +02:00 |
|
philippe grand
|
e22fb3c538
|
fix : Typo
|
2015-10-02 12:39:09 +02:00 |
|
philippe grand
|
8a9c9f49d5
|
fix : Typo
|
2015-10-02 12:37:13 +02:00 |
|
Laurent Destailleur
|
7fd01d4aa3
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/accountancy/class/bookkeeping.class.php
htdocs/compta/paiement/cheque/class/remisecheque.class.php
htdocs/product/class/html.formproduct.class.php
htdocs/product/stock/index.php
htdocs/product/stock/list.php
htdocs/product/stock/mouvement.php
htdocs/product/stock/product.php
htdocs/product/stock/valo.php
|
2015-09-09 12:45:22 +02:00 |
|
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
|
d19ec89bf1
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/core/modules/modHoliday.class.php
htdocs/holiday/card.php
|
2015-09-03 23:27:47 +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
|
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
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
Laurent Destailleur
|
00b9f98c1c
|
Merge remote-tracking branch 'origin/3.7' into develop
|
2015-08-31 12:15:20 +02:00 |
|
Marcos García de La Fuente
|
b953d2c466
|
FIX [ bug #3426 ] Unable to create an invoice from a contract with extrafields
Close #3426
|
2015-08-29 19:42:51 +02:00 |
|
Laurent Destailleur
|
15ab9c0ecd
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/core/lib/security.lib.php
htdocs/product/stock/mouvement.php
|
2015-08-20 16:08:42 +02:00 |
|