Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
37,501 Commits 36 Branches 189 Tags
7bc39d7601faa4f89aa0f9e6d0e3dfc668ea202f
Commit Graph

37501 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christophe Battarel
7bc39d7601 update changelog 2013-09-26 19:08:54 +02:00
Christophe Battarel
b7fe0cec34 fix bug on filter and sort 2013-09-26 19:05:56 +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
Laurent Destailleur
06f668a249 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-09-24 20:20:41 +02:00
Laurent Destailleur
a3e74afb02 Fix: varchar 256 2013-09-24 20:14:42 +02:00
Laurent Destailleur
a674af5bcd Fix: Permission check on event tabs 2013-09-24 11:11:59 +02:00
Laurent Destailleur
b6d5ebf81d Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-09-24 11:02:01 +02:00
Laurent Destailleur
06f36fbfab Fix: Bad permission check 2013-09-24 10:59:15 +02:00
Laurent Destailleur
bdafcb680f Fix: Bad parameters 
Conflicts:
	htdocs/comm/action/fiche.php
 2013-09-23 21:07:13 +02:00
Laurent Destailleur
8024a61376 Add missing label 2013-09-22 21:07:00 +02:00
Laurent Destailleur
c2ba7956ab Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
 2013-09-22 19:57:48 +02:00
Laurent Destailleur
ad09470f48 Fix: Better management of pdf generation when tcpdf not available. 2013-09-22 19:53:27 +02:00
Laurent Destailleur
16396b985b Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-09-21 10:54:34 +02:00
Laurent Destailleur
b74f73c885 Fix: Calculation of deposit amount when using a percent was done only on 
last line.
 2013-09-21 10:53:46 +02:00
Laurent Destailleur
53979ad58c Fix: Bad param 2013-09-20 14:29:09 +02:00
Laurent Destailleur
7a1efdbab6 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-20 11:06:09 +02:00
Laurent Destailleur
bd0e328d5b Use official package directly to build debian. 2013-09-19 23:51:47 +02:00
Laurent Destailleur
2a1dae78ca Fix: We must not remove sources from packages 2013-09-19 19:49:41 +02:00
Laurent Destailleur
a86e8f8fac Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-19 01:00:05 +02:00
Laurent Destailleur
848c693822 Fix: Error in url 2013-09-19 00:59:02 +02:00
Laurent Destailleur
30c4d5dedb Fix for debian package 2013-09-19 00:39:13 +02:00
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