Christophe Battarel
c41794ba4c
update changelog
2013-10-05 10:23:24 +02:00
Christophe Battarel
7bc39d7601
update changelog
2013-09-26 19:08:54 +02:00
Laurent Destailleur
1f938e6596
Merge remote-tracking branch 'origin/3.3' into 3.4
2013-09-25 12:16:54 +02:00
Laurent Destailleur
f5387081e0
Update doc
2013-09-25 11:25:30 +02:00
Christophe Battarel
775d259f88
Fix: Supplier price displayed on document lines and margin infos didnt take discount
2013-09-15 14:52:41 +02:00
Christophe Battarel
6959ccf627
Fix: Supplier price displayed on document lines didnt take discount
2013-09-15 11:41:41 +02:00
simnandez
817569d487
Fix: [ bug #1062 ] Documents lost in propals and contracts validating
2013-09-12 16:54:47 +02:00
simnandez
43beb38c9b
Fix: [ bug #1061 ] Bad info shipped products
2013-09-10 11:04:36 +02:00
Laurent Destailleur
104d394128
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
.travis.yml
2013-09-09 17:16:24 +02:00
Laurent Destailleur
afe58abdcd
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
...
Conflicts:
ChangeLog
2013-09-08 21:51:37 +02:00
Christophe Battarel
9fa37fc5f1
Fix: Edit propal line was losing product supplier price id
...
Conflicts:
ChangeLog
2013-09-08 21:51:08 +02:00
Florian Henry
2740cc78b6
Add dol_syslog
...
Fix bug on expedition create : create expedition with rowid (or
origin_id) that already exits, and you will have all product of the
other expedition and the new expedition form order
Revert previous commit filter sort on fourn/facture/index.php
2013-09-05 17:45:30 +02:00
Florian Henry
cb86cd403c
Fix: Delete linked element to supplier invoice when deleted (as done for
...
all other object into dolibarr)
2013-09-03 20:01:10 +02:00
simnandez
83042459a5
Fix: compatiblity with multicompany module
2013-09-02 10:07:44 +02:00
simnandez
b86e20f0e6
Fix: Intervention box links to contracts id
2013-08-29 12:05:29 +02:00
simnandez
fa4a9c73c4
Fix: Localtaxes balance not showing
2013-08-29 09:58:07 +02:00
Florian Henry
cc90c92cc0
Fix: Mailing module : if an email is already in destinaires list all
...
other email from selector was not inserted
2013-08-28 16:33:21 +02:00
simnandez
dfd14f4430
Fix: [ bug #1043 ] Bad interventions ref numbering
2013-08-27 09:44:00 +02:00
Florian Henry
2dce07590c
Fix: If only service module is activated, it's impossible to delete
...
service
2013-08-26 14:39:35 +02:00
simnandez
c242d66530
Fix: [ bug #1039 ] Pre-defined invoices conversion
2013-08-23 18:03:16 +02:00
Juanjo Menent
7e61c3703a
Merge pull request #1189 from altairis-fr/3.4
...
fix display of buying price on line edit when no supplier price is defined
2013-08-23 00:15:00 -07:00
Florian Henry
4f991da846
Fix: Link "Show all supplier invoice" on suplier card not working
2013-08-22 15:11:11 +02:00
Christophe Battarel
e00f02616d
update changelog
2013-08-22 10:49:13 +02:00
Florian Henry
71ec4ea31c
Merge remote-tracking branch 'origin/3.4' into 3.4
...
Conflicts:
ChangeLog
Change-Id: I325ab3266300286664f4790b5f2314255ac1911d
2013-08-21 17:32:52 +02:00
Florian Henry
ba4fde20ce
Fix UserGroup name not display in card view or edit
2013-08-21 17:03:13 +02:00
simnandez
4e34e7b71c
Fix: [ bug #1037 ] Consumption> Supplier invoices related
2013-08-21 12:06:02 +02:00
Florian Henry
60b3f61339
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
...
Conflicts:
ChangeLog
2013-08-13 12:13:47 +02:00
Florian Henry
5fcbd2d14f
Fix Bug with canvas
2013-08-12 19:44:30 +02:00
simnandez
067c8c55b9
Fix: [ bug #1033 ] SUPPLIER REF disappeared
2013-08-12 18:42:01 +02:00
Florian Henry
26d1352de4
Fix update extrafield do not display immediatly
2013-08-12 14:30:42 +02:00
Florian Henry
75701ee995
Fix: Supplier invoice and supplier order are not displayed into object
...
link into agenda event card
2013-08-09 13:11:18 +02:00
simnandez
b9e1a57f67
Fix: [ bug #1029 ] Tulip numbering mask
2013-08-08 10:00:06 +02:00
Laurent Destailleur
e9df22dcc0
Fix: restore lost info into changelog.
...
Add note of todo for next versions.
2013-08-01 04:28:12 +02:00
Laurent Destailleur
f765288f12
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
ChangeLog
2013-07-31 12:38:15 +02:00
Laurent Destailleur
83e2f0dc48
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/core/class/html.formfile.class.php
htdocs/filefunc.inc.php
2013-07-27 12:40:59 +02:00
Laurent Destailleur
a43e7fd34e
Fix: Changelog
2013-07-27 12:39:01 +02:00
Florian Henry
7af45ccdf3
update changelog
2013-07-26 12:52:51 +02:00
Florian Henry
95606dde04
Just update space into change log
2013-07-08 14:54:55 +02:00
Florian Henry
3db195cb48
[ bug #971 ] html.form.class.php select_contact with autocomplete do not
...
exclude id from exclude array
2013-07-08 12:51:17 +02:00
Florian Henry
b1b68eafe3
[ bug #972 ] Auto completion contact field do not take account the min
...
caract number before search
2013-07-08 12:47:07 +02:00
Laurent Destailleur
8359a34545
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
ChangeLog
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/compta/facture/class/facture-rec.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/filefunc.inc.php
2013-06-25 21:31:24 +02:00
simnandez
065b30f0d0
[Bug #958 ] LocalTax2 for Spain fails on Suppliers
2013-06-25 11:12:21 +02:00
Marcos García
676191c1f9
Fix: [ bug #947 ] Can't create proposal lines with unit price = 0
2013-06-19 10:22:46 +02:00
Florian Henry
fb0a99cb55
Fix [ bug #934 ] Impossible de créer une facture prédéfinie (pgsql)
2013-06-13 15:05:19 +02:00
Laurent Destailleur
6cf1d25529
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
ChangeLog
2013-06-03 11:09:40 +02:00
Marcos García
8ae0939ae5
Fixed bug #903 : Fatal error: Call to undefined function dol_get_first_day() in htdocs/commande/liste.php
2013-06-01 15:39:45 +02:00
Laurent Destailleur
1cb33c43bd
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/comm/action/listactions.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/agenda.lib.php
htdocs/product/liste.php
2013-05-29 01:30:36 +02:00
Christophe Battarel
5de7f77a09
update ChaneLog
2013-05-23 23:09:32 +02:00
Laurent Destailleur
71e14df62f
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/freeproductline_create.tpl.php
htdocs/core/tpl/predefinedproductline_create.tpl.php
2013-05-20 17:37:08 +02:00
Christophe Battarel
fea0e6de54
Fix - external users should not see costprice and margin infos
2013-05-19 14:06:51 +02:00