Laurent Destailleur
899c209468
Merge remote-tracking branch 'origin/3.3' into 3.4
2013-09-11 23:10:54 +02:00
Laurent Destailleur
239cb02613
Doc
2013-09-11 23:10:19 +02:00
Laurent Destailleur
6f2652f2b6
Fix: Use correct standard
2013-09-11 23:07:47 +02:00
Laurent Destailleur
301187a117
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
COPYRIGHT
dev/initdata/mysqldump_dolibarr_3.3.0.sql
htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js
2013-09-11 21:54:57 +02:00
Laurent Destailleur
d6c35c1ee7
Fix: Opensource rules violation (sources must be included with lib)
2013-09-11 21:39:33 +02:00
Laurent Destailleur
30d2af26f8
Fix: phpunit test
2013-09-11 14:26:25 +02:00
Laurent Destailleur
4362771e01
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-09-11 14:21:23 +02:00
Laurent Destailleur
fa0825885a
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
2013-09-11 14:20:36 +02:00
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
fa5fea68b0
Removed warnings
2013-09-10 12:25:42 +02:00
Laurent Destailleur
c02b0f2381
Removed warnings
2013-09-10 12:25:02 +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
e2110e620c
Fix: syntax error in ruleset.xml
2013-09-10 02:32:39 +02:00
Laurent Destailleur
2f0ad6a22c
Fix: syntax error in ruleset.xml
2013-09-10 02:32:33 +02:00
Laurent Destailleur
0fa836fd45
Fix bad name
2013-09-09 20:42:12 +02:00
Laurent Destailleur
11992dca9f
Fix init data sql
2013-09-09 20:37:44 +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
