lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,093 Commits 43 Branches 150 Tags 886 MiB
6ff049bcd9
Commit Graph

36093 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
12cae7ebdf Fix: No warning if due date unknown 2013-04-07 21:13:48 +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
simnandez
bde030dfae Spelling fix 2013-04-07 16:08:11 +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
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
Laurent Destailleur
fafd426903 Fix: [ bug #787 ] Invoice supplier box incorrect tooltip when delay on 
payment
 2013-04-07 14:40:13 +02:00
Laurent Destailleur
87b50f9ced Fix: Can't reset payment due date 2013-04-07 14:36:22 +02:00
simnandez
7b70fc4bf3 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 14:30:44 +02:00
Laurent Destailleur
7e46a74fac Fix: Remove warnings 2013-04-07 13:44:04 +02:00
Laurent Destailleur
4e5a71fb22 New: Add local and vat rate for peru 2013-04-06 18:59:22 +02:00
Laurent Destailleur
eaab6d0caa Trans: For peru, IVA is IGV 2013-04-06 18:51:07 +02:00
Laurent Destailleur
88858136fc New: Enhance agenda module to reach RFC2445 (add busy information). 2013-04-06 17:39:31 +02:00
Laurent Destailleur
ee2a2f7b48 Missing space 2013-04-06 16:43:26 +02:00
Laurent Destailleur
d863a0b1bd Fix: syntax error 2013-04-06 16:21:34 +02:00
Laurent Destailleur
25ec7eed6d New: Can send email to warn when payment for subscription is payed. 2013-04-06 16:14:28 +02:00
fhenry
2b0668bf81 Add paiement mode et delay on PDF muscadet 2013-04-06 13:38:32 +02:00
fhenry
9ff559b033 Add wished delivery date into supplier orders PDF muscadet 2013-04-06 13:06:26 +02:00
fhenry
0aba3cfc05 Fix order_supplier and invoice_supplier PDF model name 2013-04-06 13:00:41 +02:00
fhenry
48b510dd45 Same bug fixing 2013-04-06 12:42:54 +02:00
fhenry
e5bdcdcadb Same bug fixing 2013-04-06 12:37:38 +02:00
fhenry
7d2ba5f1b3 Fix bug : create supplier invoice ($infos_bits instead of $info_bits) 
in updateline sql query
 2013-04-06 12:35:35 +02:00
fhenry
cc465380da Fix upgrade bug (llx_printer_ipp) wrong syntax (my fault, sorry) 2013-04-06 12:20:19 +02:00
fhenry
b7137606ee Merge branch 'develop' into develop_orderextrafield 
Conflicts:
	htdocs/commande/fiche.php
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

Change-Id: If57a2f2a386a2903b976178eb63aef2c8b09473d
 2013-04-06 10:41:29 +02:00
simnandez
ec7a6433f6 Update Changelog 2013-04-06 08:56:47 +02:00
simnandez
50548601ce Resolve conflicts 2013-04-06 08:20:57 +02:00
Laurent Destailleur
f22b1d3678 Enhance specimens 2013-04-06 03:40:55 +02:00
Laurent Destailleur
bd1d9b719b More generic specimen data 2013-04-06 00:37:20 +02:00
Laurent Destailleur
adf47d6975 Qual: Uniformise columns 2013-04-06 00:34:33 +02:00
Laurent Destailleur
1cf2276584 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/comm/prospect/list.php
 2013-04-05 22:59:06 +02:00
Laurent Destailleur
815bb82b0e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-05 22:51:19 +02:00
Laurent Destailleur
c10f2dd327 Merge pull request #807 from FHenry/3.3_bug794 
Fix [ bug #794 ] Lost filter on zipwode in prospect list
 2013-04-05 13:50:27 -07:00
Laurent Destailleur
5f2ea4c65c Merge pull request #804 from atm-maxime/develop 
Fixes on invoice payment list and for price by quantity
 2013-04-05 13:49:52 -07:00