lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,748 Commits 43 Branches 150 Tags 886 MiB
4e2c321e4d
Commit Graph

40748 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
4e2c321e4d Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2014-12-26 04:09:08 +01:00
Laurent Destailleur
83e34a1c4e Merge branch 'marcosgdf-bug-1769' into 3.5 2014-12-26 04:07:53 +01:00
Laurent Destailleur
f31bf5d80e Merge pull request #2175 from marcosgdf/bug-1752 
Fix: [ bug #1752 ] Date filter of margins module, filters since 12H instead of 00H
 2014-12-26 03:49:02 +01:00
Marcos García de La Fuente
f4def9ea28 Fix: [ bug #1769 ] Error when installing to a PostgreSQL DB that contains numbers 2014-12-26 00:07:24 +01:00
Marcos García de La Fuente
416f13c708 Fix: [ bug #1752 ] Date filter of margins module, filters since 12H instead of 00H 2014-12-23 16:00:04 +01:00
Laurent Destailleur
1c2c1ff3d8 Update codesniffer to remove travis errors. 2014-12-19 19:09:15 +01:00
Laurent Destailleur
47cab90336 Update codesniffer to remove travis errors. 2014-12-19 19:01:29 +01:00
Laurent Destailleur
f5da9b5e33 Merge pull request #2149 from altatof/3.5 
FIX: dont put a mess with date and datetime extrafield value if already in right format
 2014-12-18 10:04:03 +01:00
Laurent Destailleur
6728ad3c37 Merge pull request #2148 from altatof/fixhook 
FIX: hook insertExtraFields must return a returnvalue (0,1,-1)
 2014-12-18 10:03:32 +01:00
Laurent Destailleur
4887f51174 Merge pull request #2158 from altatof/fix_fichinter_pdf_pagebreak 
FIX: pagebreak on fichinter like in other documents
 2014-12-18 10:02:25 +01:00
Laurent Destailleur
615456382d Merge pull request #2157 from altatof/fix_margin_jalon 
FIX: avoid milestones in margin calculation
 2014-12-18 10:01:11 +01:00
Christophe Battarel
c9f69279c7 FIX: pagebreak on fichinter like in other documents 2014-12-16 16:21:31 +01:00
Christophe Battarel
a4a1a991b8 FIX: avoid milestones in margin calculation 2014-12-15 14:13:57 +01:00
Christophe Battarel
27b47a4f48 FIX: dont put a mess with date and datetime extrafield value if already 
in right format (the bug was in propale/order/invoice extrafields,
mainly visible with 2 datetime extrafields)
 2014-12-12 14:31:36 +01:00
Christophe Battarel
a1bba472a0 FIX: hook insertExtraFields must return a returnvalue (0,1,-1) 2014-12-12 11:57:20 +01:00
Laurent Destailleur
fbb25eae11 Merge pull request #2138 from aspangaro/3.5-patch1 
Correct in activity box
 2014-12-10 11:31:48 +01:00
aspangaro
81dc1415de Untranslatable token in activity box 2014-12-09 05:04:39 +01:00
aspangaro
666e66e78f Correct link in activity box 2014-12-09 05:04:12 +01:00
Laurent Destailleur
b11ac14cf0 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-12-09 01:13:34 +01:00
Laurent Destailleur
1461072801 Fix: Paypal link were broken dur to SSL v3 closed. 2014-12-09 01:12:52 +01:00
Laurent Destailleur
293726c5e8 Merge pull request #2135 from FHenry/3.5 
3.5
 2014-12-07 23:58:30 +01:00
Florian HENRY
bd8b393d8a Fix [ bug #1740 ] Clone project make task date crazy 2014-12-05 21:25:43 +01:00
Florian HENRY
aaf2cca45f Fix bug n sellist extrafield filtered 2014-12-05 21:25:43 +01:00
Laurent Destailleur
9e1b0d1abc Prepare 3.5.6 2014-12-04 15:09:47 +01:00
Laurent Destailleur
bd8391163a Merge pull request #2067 from frederic34/patch-2 
Fix bug 1692 Can't update phone_pro with the contact webservice
 2014-11-23 16:48:33 +01:00
Laurent Destailleur
989cd87446 Merge pull request #2066 from altatof/fix_margin_recap 
FIX: bad margin and buy_price calculation when total_ht = 0 (discount 100%) on a line
 2014-11-23 16:48:21 +01:00
Frédéric FRANCE
891f8d9442 Fix bug 1692 Can't update phone_pro with the contact webservice 2014-11-22 19:02:15 +01:00
Laurent Destailleur
2f4de2ef75 Merge pull request #2016 from altatof/3.5 
FIX: copy extrafields when creating order from propale and creating
 2014-11-22 16:02:13 +01:00
Christophe Battarel
7d8cf99d58 FIX: bad margin and buy_price calculation when total_ht = 0 (discount 
100%) on a line
 2014-11-19 18:19:27 +01:00
Christophe Battarel
d0dc792b3c check extrafields before inserting in DB 2014-11-17 11:17:45 +01:00
Laurent Destailleur
2aeb0f4f5b Merge pull request #1941 from jfefe/patch-3 
Avoid missing class error for fetch_thirdparty method
 2014-11-15 12:36:41 +01:00
Christophe Battarel
7ed496d7d9 FIX: copy extrafields when creating order from propale and creating 
invoice from order
 2014-11-12 17:51:26 +01:00
Laurent Destailleur
606a3f9917 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-11-04 17:54:09 +01:00
Laurent Destailleur
45d57b0492 Merge pull request #1995 from atm-maxime/3.4 
Fix : actioncomme report was not filtering by entity...
 2014-11-04 17:41:40 +01:00
Maxime Kohlhaas
ccddf0d1be Fix : actioncomme report was not filtering by entity... 2014-10-31 16:56:14 +01:00
Laurent Destailleur
e3041f45ee Update changelog 2014-10-30 18:08:42 +01:00
Laurent Destailleur
aac24c887f Merge pull request #1973 from jfefe/patch-6 
Avoid missing class error for fetch_thirdparty method
 2014-10-30 18:07:49 +01:00
jfefe
29db45c763 Avoid missing class error for fetch_thirdparty method 2014-10-23 01:15:05 +02:00
Laurent Destailleur
a94f7dc3ad Revert "Add function dolEscapeXML" 
This reverts commit 756b1d31ad.
 2014-10-16 01:21:33 +02:00
Laurent Destailleur
efa171819a Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-10-16 01:19:33 +02:00
Laurent Destailleur
756b1d31ad Add function dolEscapeXML 2014-10-16 01:01:30 +02:00
Regis Houssin
104592b349 Fix: wrong function name 2014-10-12 19:08:34 +02:00
Laurent Destailleur
797ab8a150 Merge pull request #1940 from aternatik/fix-cron 
Missing reprogramming task into GUI for cron module.
 2014-10-12 02:10:09 +02:00
jfefe
6a4468d94e Not need to test if class exists with require_once 2014-10-06 14:18:28 +02:00
jfefe
87fc27c7e6 Avoid missing class error for fetch_thirdparty method 2014-10-06 13:31:01 +02:00
jfefe
fdbf2fb45d Missing reprogramming task into GUI for cron module. 
Without this, a new task is never executed (because without datenextrun defined)
 2014-10-06 13:28:07 +02:00
Laurent Destailleur
c73f4a14ee Fix: Bad days returned by function 2014-10-05 16:17:09 +02:00
Laurent Destailleur
742d0e37ee Fix: Bad month return by function 2014-10-05 12:54:51 +02:00
Laurent Destailleur
05fe8e45b3 Exclude module dire from package 2014-10-03 19:07:49 +02:00
Laurent Destailleur
d455ee7b56 Merge pull request #1933 from atm-maxime/3.5 
Fix : tva not coming from multiprice
 2014-10-03 02:46:22 +02:00