lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,377 Commits 43 Branches 150 Tags 886 MiB
561d0ea46b
Commit Graph

38377 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Grand Philippe
832fa1fb31 prepair for insert ExtraFields 2013-04-08 17:46:01 +02:00
Laurent Destailleur
c6b66a9f4a Normalize code 2013-04-08 17:42:24 +02:00
Grand Philippe
e54056b805 prepair for insert ExtraFields 2013-04-08 17:39:32 +02:00
Grand Philippe
fbe5947bc2 prepair for insert ExtraFields 2013-04-08 17:17:13 +02:00
Grand Philippe
d1ac79d9ef Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-04-08 16:22:03 +02:00
Grand Philippe
e21e08717e normalize code 2013-04-08 16:06:57 +02:00
Grand Philippe
ea077e959b normalize code 2013-04-08 14:57:06 +02:00
frederic34
9099fe9461 Merge remote-tracking branch 'upstream/develop' into develop 2013-04-08 14:24:25 +02:00
Grand Philippe
d7f2c9c480 some fixes for missing names 2013-04-08 14:21:42 +02:00
Grand Philippe
707ef0f378 some fixes for missing names 2013-04-08 14:12:46 +02:00
Grand Philippe
76929325f1 some fixes for missing names 2013-04-08 12:57:33 +02:00
Regis Houssin
f3bbfe375c Fix: for multicompany compatibility 2013-04-08 12:41:48 +02:00
Regis Houssin
cea2f047a2 Fix: for multicompany compatibility 2013-04-08 12:38:51 +02:00
Grand Philippe
0eef6c7808 some fixes for wrong and missing names 2013-04-08 12:29:49 +02:00
Grand Philippe
79b3907ec9 some fixes for wrong and missing names 2013-04-08 12:18:19 +02:00
Grand Philippe
a593e5d4e5 fix: wrong url 2013-04-08 11:56:50 +02:00
frederic34
40f11206de Merge remote-tracking branch 'upstream/develop' into develop 
Conflicts:
	htdocs/commande/fiche.php
 2013-04-08 11:33:45 +02:00
Laurent Destailleur
6ff049bcd9 Merge pull request #806 from FHenry/develop_orderextrafield 
[ task #793 ] Add extrafield feature into Orders module
 2013-04-08 02:08:32 -07:00
fhenry
8efeb93812 Merge branch 'develop' into develop_orderextrafield 2013-04-08 09:45:43 +02:00
fhenry
a27b3a2119 Fix PostGreSQL blocking install : wrong SQL syntax 2013-04-08 09:45:11 +02:00
fhenry
52706117d9 Merge branch 'develop' into develop_orderextrafield 2013-04-07 23:54:33 +02:00
fhenry
393007625a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

Change-Id: I9df271d1629014299e7db131a66c1322aa897f6d
 2013-04-07 23:52:02 +02:00
Laurent Destailleur
4ce7a70411 Merge pull request #813 from marcosgdf/3.3 
Removed duplicated code and fixed a problem with orders2invoice
 2013-04-07 14:00:32 -07:00
Laurent Destailleur
3247ce2d1b Merge pull request #811 from lrq3000/develop 
update: Sync odtphp lib (fix a lot of bugs and add a few functionalities)
 2013-04-07 13:59:53 -07:00
Laurent Destailleur
826d8a329d Merge pull request #802 from simnandez/develop 
Fix: Try to showing the events related to a intervention
 2013-04-07 13:54:53 -07:00
Laurent Destailleur
19c8336e6e Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-04-07 22:51:31 +02:00
Marcos García
303cf3bc41 Updated changelog 2013-04-07 22:01:33 +02:00
Marcos García
6013916d45 Removed duplicated code and fixed a problem with orders2invoice 2013-04-07 21:58:24 +02:00
Laurent Destailleur
12cae7ebdf Fix: No warning if due date unknown 2013-04-07 21:13:48 +02:00
Laurent Destailleur
b678183ff2 Log 2013-04-07 21:09:57 +02:00
Laurent Destailleur
d0d146cabf Translation 2013-04-07 20:15:03 +02:00
Laurent Destailleur
b3f9fbb3bc Update case after mutualizing code. 2013-04-07 18:07:16 +02:00
Laurent Destailleur
6e5f1c5d31 Fix: Some regressions 2013-04-07 17:57:17 +02:00
Laurent Destailleur
5c3e6de073 Qual: Mutualize code. Only one function to build address format. 2013-04-07 17:39:08 +02:00
Stephen L
6e1e41e8b5 update: Sync odtphp lib (fix a lot of bugs and add a few functionalities) 
Ref: b4e02a1306

Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2013-04-07 17:27:35 +02:00
Laurent Destailleur
8e2171b64c Fix: Error management and missing transactions check 2013-04-07 16:39:20 +02:00
Juanjo Menent
29124649bd Merge pull request #810 from simnandez/3.3 
Update ChangeLog
 2013-04-07 07:09:10 -07:00
simnandez
bde030dfae Spelling fix 2013-04-07 16:08:11 +02:00
simnandez
8f67606685 Spelling fix 2013-04-07 16:04:57 +02:00
simnandez
44bfc1db4a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-04-07 15:53:31 +02:00
simnandez
9e8c3a1b1e Updates 2013-04-07 15:45:48 +02:00
Laurent Destailleur
59dfab9d21 Fix: regresson after rename of fields 2013-04-07 15:43:21 +02:00
simnandez
482d30ca1d Update ChangeLog 2013-04-07 15:40:54 +02:00
simnandez
35279f6520 Update ChangeLog 2013-04-07 15:17:31 +02:00
Laurent Destailleur
ff3c8ec0be Fix: Better error management 2013-04-07 15:16:19 +02:00
fhenry
78571e4458 Merge branch 'develop' into develop_orderextrafield 2013-04-07 15:12:27 +02:00
fhenry
0427080a4e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_orderextrafield

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

Change-Id: I91fe24831dca9e1d9e6b09f85dd4b7bd37bd638e
 2013-04-07 15:11:52 +02:00
fhenry
144ab24545 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

Change-Id: I51b110ec2c087110ab6080d1e754438ce83bd9cd
 2013-04-07 15:08:47 +02:00
simnandez
515c5e58ca Update Changelog 2013-04-07 15:04:55 +02:00
Laurent Destailleur
64a9689473 Fix: [ bug #787 ] Invoice supplier box incorrect tooltip when delay on 
payment
 2013-04-07 14:41:42 +02:00