Laurent Destailleur
cb95355d37
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-09-10 12:27:25 +02:00
Laurent Destailleur
0cb8e2e710
Removed warnings
2013-09-10 12:26:48 +02:00
Laurent Destailleur
2db0a56b17
Merge pull request #1225 from jfefe/fix_ws_order
...
Fix : missing lib / bad property name in order webservice
2013-09-10 02:44:22 -07:00
jfefe
5abbee02c8
Fix : missing lib / bad property name in order webservice
2013-09-10 11:23:36 +02:00
simnandez
43beb38c9b
Fix: [ bug #1061 ] Bad info shipped products
2013-09-10 11:04:36 +02:00
Laurent Destailleur
7670ed5ae0
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
test/phpunit/PdfDocTest.php
2013-09-09 19:55:07 +02:00
Laurent Destailleur
574c4373b4
Fix: bug with php 5.4
2013-09-09 19:53:35 +02:00
Laurent Destailleur
904f29c7cc
Fix: data init
2013-09-09 19:29:47 +02:00
Laurent Destailleur
2b8af33505
Fix: eof
2013-09-09 19:15:34 +02:00
Laurent Destailleur
2ec45acbbd
Merge pull request #1224 from jfefe/fix_ws_invoice
...
Fix ws invoice
2013-09-09 08:53:00 -07:00
Laurent Destailleur
e932bef031
Fix: Bug with php 5.4
2013-09-09 17:50:42 +02:00
Laurent Destailleur
558dde4c50
Fix: sql init data does not match 3.4 data
2013-09-09 17:33:52 +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
jfefe
13e235ca8a
Fix: permission check in invoice webservice
...
remove comment & indent code
2013-09-09 17:08:22 +02:00
Laurent Destailleur
f1dec66757
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-09-09 17:08:03 +02:00
Laurent Destailleur
745d5c9520
Enabled travis-ci on old branch
2013-09-09 17:07:04 +02:00
Laurent Destailleur
411a6bb819
Enabled travis-ci on old branch
2013-09-09 17:05:52 +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
Laurent Destailleur
2d354de549
Merge pull request #1211 from FHenry/3.4
...
Fix: Delete linked element to supplier invoice when deleted (as done for
2013-09-06 13:49:27 -07:00
Laurent Destailleur
5b91e27a85
Merge remote-tracking branch 'origin/3.3' into 3.4
2013-09-06 22:32:21 +02:00
Laurent Destailleur
8a0ac8b650
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
2013-09-06 13:43:12 +02:00
Laurent Destailleur
651596e8d5
Fix: missing ;
2013-09-06 13:42:14 +02:00
Laurent Destailleur
f45be6a2a7
Prepare for 3.4.1
...
Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
build/debian/changelog
2013-09-06 01:37:07 +02:00
Laurent Destailleur
5db9505f40
Fix debian package
2013-09-06 01:30:49 +02:00
Laurent Destailleur
a9c14c80f0
Fix: debian files
2013-09-06 01:27:11 +02:00
Laurent Destailleur
10779baadd
Merge remote-tracking branch 'origin/3.3' into 3.4
2013-09-05 23:55:14 +02:00
Laurent Destailleur
c71c4e86f6
Fix: watch file for debian package.
2013-09-05 23:52:13 +02:00
Laurent Destailleur
556827c818
Fix: wash file
2013-09-05 22:58:11 +02:00
Laurent Destailleur
b1e8b9c02f
Merge remote-tracking branch 'origin/3.3' into 3.4
2013-09-05 17:56:23 +02:00
Laurent Destailleur
2ce6f55d92
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
2013-09-05 17:54:00 +02:00
Laurent Destailleur
7afb1aef14
Fix: Image was not correctly generated. Bad licence into it.
2013-09-05 17:53:07 +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
95ff16f145
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-09-05 17:39:49 +02:00
Laurent Destailleur
da7c8b42f2
Fix: Image was not correctly generated. Bad licence into it.
2013-09-04 22:34:49 +02:00
Laurent Destailleur
c3c9e59974
Fix: Image was not correctly generated. Bad licence into it.
2013-09-04 22:33:49 +02:00
Laurent Destailleur
e40d644085
Fix: Remove warning
2013-09-04 16:49:20 +02:00
Laurent Destailleur
af22d38681
Fix: Bad total without tax
2013-09-04 15:07:35 +02:00
Laurent Destailleur
b1c25d91cd
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-09-04 10:45:35 +02:00
Laurent Destailleur
ee0f44c9e3
Fix: Try a fix of cloning lines->array
2013-09-04 10:45:15 +02:00
Laurent Destailleur
232cf5e086
Merge pull request #1214 from aspangaro/3.4
...
Update translation fr_FR
2013-09-04 01:26:30 -07:00
aspangaro
91320ef99c
Update translation fr_FR
2013-09-04 05:17:33 +02:00
Florian Henry
ddeca06f32
Real ref filter
2013-09-03 21:13:05 +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
Laurent Destailleur
b95aa1ac7b
Fix: select list on external table
...
Conflicts:
htdocs/core/class/extrafields.class.php
2013-09-02 00:41:14 +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
Laurent Destailleur
e741ce9ea2
Merge pull request #1201 from FHenry/3.4
...
Fix: Mailing module : if an email is already in destinaires list all
2013-08-28 07:41:01 -07: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
