lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,479 Commits 43 Branches 150 Tags 886 MiB
369eabc69e
Commit Graph

37479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
369eabc69e Fix: bad condition 
Conflicts:
	htdocs/societe/societe.php
 2013-09-18 23:26:35 +02:00
Laurent Destailleur
5cbccd5fc0 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-09-16 13:44:37 +02:00
Laurent Destailleur
a1e7333613 Fix: bug preventing creation of predefined invoice. 
Also added phpunit test to detect it if it occurs again.
 2013-09-16 13:42:42 +02:00
Laurent Destailleur
efcab8a596 Merge pull request #1237 from altairis-fr/3.4 
Fix: Supplier price displayed on document lines and margin infos didnt take discount
 2013-09-15 06:57:22 -07: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
Laurent Destailleur
c1b6e05cc0 Fix: bad sql syntax 2013-09-15 12:46:54 +02:00
Juanjo Menent
1afd3aada3 Merge pull request #1236 from altairis-fr/3.4 
Fix: Supplier price displayed on document lines didnt take discount
 2013-09-15 02:56:27 -07:00
Christophe Battarel
6959ccf627 Fix: Supplier price displayed on document lines didnt take discount 2013-09-15 11:41:41 +02:00
Christophe Battarel
c9c86c9b18 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr into 3.4 
Conflicts:
	ChangeLog
 2013-09-15 11:15:31 +02:00
Laurent Destailleur
d7f9e91955 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-14 20:53:39 +02:00
Laurent Destailleur
9adbb0e973 Fix: update copyright file 2013-09-14 20:51:21 +02:00
Laurent Destailleur
914e167183 Fix: Bad sql request 2013-09-14 14:34:45 +02:00
Laurent Destailleur
443eba900a Fix: Bad translation 2013-09-14 12:52:04 +02:00
Laurent Destailleur
707bba3d7d Fix: W3C 2013-09-13 10:40:49 +02:00
Laurent Destailleur
54976951a1 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-13 09:24:09 +02:00
Laurent Destailleur
86e827e3f7 Fix: Missing sources 
Fix: packager
 2013-09-12 23:47:36 +02:00
simnandez
817569d487 Fix: [ bug #1062 ] Documents lost in propals and contracts validating 2013-09-12 16:54:47 +02:00
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