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

40772 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
a9eebb33fd Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2015-03-14 13:45:27 +01:00
Laurent Destailleur
89b22be063 FIXED: Allowed 0 to be used as an account mask. Required by CEGID. 2015-03-14 13:44:26 +01:00
Laurent Destailleur
da72cf387b Merge pull request #2451 from Dolibarr/revert-2318-3.5-accountingmask 
Revert "FIXED Allowed 0 to be used as an account mask"
 2015-03-14 13:43:04 +01:00
Laurent Destailleur
4a9a3ab04b Revert "FIXED Allowed 0 to be used as an account mask" 2015-03-14 13:42:58 +01:00
Laurent Destailleur
da042c1677 Merge pull request #2318 from GPCsolutions/3.5-accountingmask 
FIXED Allowed 0 to be used as an account mask
 2015-03-14 13:42:46 +01:00
Laurent Destailleur
d549c00b2e Merge pull request #2365 from marcosgdf/3.5 
Fix: [ bug #1846 ] Browser IE11 not detected
 2015-02-20 20:02:11 +01:00
Laurent Destailleur
9f8bee3501 Merge pull request #2331 from altatof/fix_natural_search 
FIX: select DISTINCT for natural search on proposal list (in the same way it's done in invoices list)
 2015-02-18 22:16:43 +01:00
Marcos García de La Fuente
3efb737cbf Fix: [ bug #1845 ] Undefined "$conf->browser->ie" var in "functions.lib.php" 2015-02-16 12:30:10 +01:00
Marcos García de La Fuente
6f08893016 Fix: [ bug #1846 ] Browser IE11 not detected 2015-02-16 12:26:20 +01:00
Raphaël Doursenaud
7dea799a9e FIXED Allowed 0 to be used as an account mask 
0 is used by some accounting systems and software.
 2015-02-10 17:18:32 +01:00
Christophe Battarel
3940abe7c1 FIX: select DISTINCT for natural search on proposal list (in the same 
way it's done in invoices list)
 2015-02-07 10:48:03 +01:00
Laurent Destailleur
3ec5b46864 Merge pull request #2294 from altatof/fix_fournprice_visibility 
FIX: always show fournprice select
 2015-01-31 19:47:46 +01:00
Christophe Battarel
04f83ae4ff FIX: always show fournprice select 2015-01-28 16:19:56 +01:00
Laurent Destailleur
a51ea308f5 Merge branch 'marcosgdf-bug-1762' into 3.5 2015-01-18 13:46:15 +01:00
Laurent Destailleur
05f08a7181 Merge branch 'bug-1762' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1762

Conflicts:
	ChangeLog
 2015-01-18 13:43:57 +01:00
Laurent Destailleur
5087ac8153 Merge pull request #2237 from marcosgdf/bug-1797 
Fix:  [ bug #1797 ] Tulip Supplier invoice module takes creation date instead of invoice date
 2015-01-16 12:08:09 +01:00
Marcos García de La Fuente
4da52cf733 Fix: [ bug #1797 ] Tulip Supplier invoice module takes creation date instead of invoice date 2015-01-13 11:11:37 +01:00
Marcos García de La Fuente
7e16d0c1d3 Fix: [ bug #1792 ] Users are not allowed to see margins module index page when no product view permission is enabled 2015-01-13 01:48:58 +01:00
Laurent Destailleur
490b0c5f3a Merge branch 'marcosgdf-bug-1768' into 3.5 2014-12-26 04:13:36 +01:00
Laurent Destailleur
77e48f8c3e Merge branch 'bug-1768' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-1768 2014-12-26 04:12:58 +01:00
Laurent Destailleur
882fd9a798 Merge branch 'marcosgdf-bug-1757' into 3.5 2014-12-26 04:11:30 +01:00
Laurent Destailleur
38c9d39c2b Merge branch 'bug-1757' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1757

Conflicts:
	ChangeLog
 2014-12-26 04:11:15 +01:00
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
8e47fe9e1c Fix: [ bug #1757 ] Sorting breaks product/service statistics 2014-12-26 00:19:09 +01:00
Marcos García de La Fuente
1d39c1acc2 Fix: [ bug #1768 ] PHP Warning when error connecting to a PostgreSQL server in install script 2014-12-26 00:12:16 +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