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

43267 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcos García de La Fuente
e9d1e6265d Fix: [ bug #2696 ] Adding complementary attribute fails if code is numerics 
Close #2696
 2015-07-18 14:25:05 +02:00
Laurent Destailleur
d7e9bccad6 Merge pull request #3199 from atm-maxime/fix_rejet_prel 
Fix : withdrawal rejection were taking the total amount of the invoic…
 2015-07-16 10:20:46 +02:00
Florian HENRY
01d1c89f11 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2015-07-15 15:16:09 +02:00
Maxime Kohlhaas
5223934ff0 Fix #3188 SQL error if qty or discount is not a number on proposal add line 2015-07-14 12:17:50 +02:00
Maxime Kohlhaas
20bdfdb286 Fix : withdrawal rejection were taking the total amount of the invoice instead of the amount of the withdrawal 2015-07-14 11:57:47 +02:00
Juanjo Menent
e2b5bc756a Merge pull request #3174 from hregis/3.6_bug 
Fix: missing shared parameters
 2015-07-09 09:36:52 +02:00
Regis Houssin
9e7cb70d63 Fix: missing shared parameters 2015-07-08 16:03:15 +02:00
Regis Houssin
aff3f03ae0 Merge remote-tracking branch 'origin/3.6' into 3.6_bug 2015-07-08 16:01:26 +02:00
Laurent Destailleur
5d588714f0 Merge pull request #3135 from atm-ph/3.6_fix_socpeople_country_display 
FIX : wrong display with contact country
 2015-07-04 04:41:20 +02:00
Laurent Destailleur
3c77a5ca21 Merge pull request #3132 from atm-maxime/3.6 
Fix : Project list was not keeping parameters on sorts
 2015-07-04 04:35:11 +02:00
Maxime Kohlhaas
5d14d05ce1 Fix : Social contribution payment deletion was not deleting the bank line 2015-07-03 16:38:54 +02:00
phf
c87328b362 FIX : contact country had wrong display if the country dont have translate 2015-07-02 17:00:37 +02:00
Maxime Kohlhaas
ee643ed2a7 Fix : Project list was not keeping parameters on sorts 2015-07-02 14:08:16 +02:00
Laurent Destailleur
461b5f0882 Merge pull request #3086 from atm-ph/3.6_fix_export_extrafield_select 
FIX : tool export extrafields
 2015-06-27 02:20:39 +02:00
Juanjo Menent
e72c118274 Merge pull request #3104 from atm-ph/3.6_fix_search_filter_on_reassort 
FIX filter by "category / not enough stock"
 2015-06-26 17:29:01 +02:00
phf
582f9cd214 FIX : keep filter by category or by not enough stock if we switch page 2015-06-26 11:04:08 +02:00
Florian HENRY
ac6619daef Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2015-06-24 12:29:42 +02:00
phf
06962cb4e6 FIX : tool export handle the type "select" extrafields and return the value instead of id 2015-06-23 16:26:05 +02:00
Laurent Destailleur
bd4d108217 Merge pull request #3058 from fmarcet/3.5 
Fix: Date filter on customer orders
 2015-06-17 00:19:03 +02:00
fmarcet
05cb1f7ba7 Fix: Date filter on customer orders 2015-06-16 16:59:48 +02:00
Laurent Destailleur
34468644ef Merge remote-tracking branch 'origin/3.5' into 3.6 2015-06-16 11:15:16 +02:00
Laurent Destailleur
fa8defa1bf Merge pull request #3034 from marcosgdf/bug-2814-2 
Fix #2814 JPEG photos are not displayed in Product photos page
 2015-06-16 11:10:24 +02:00
Marcos García de La Fuente
2d3ab3b658 Merge remote-tracking branch 'upstream/3.5' into bug-2814-2 
Conflicts:
	ChangeLog
 2015-06-15 09:39:17 +02:00
Laurent Destailleur
f4da53c300 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/product/liste.php
	htdocs/product/price.php
 2015-06-14 17:04:24 +02:00
Laurent Destailleur
1007aba6a9 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2015-06-14 17:02:11 +02:00
Laurent Destailleur
14a8a2269b FIX End log must use same level then start log. 2015-06-14 16:59:35 +02:00
Laurent Destailleur
1fc4716617 Merge branch 'marcosgdf-bug-2835' into 3.5 2015-06-14 16:07:38 +02:00
Laurent Destailleur
fadc640335 Merge branch 'bug-2835' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-2835

Conflicts:
	ChangeLog
 2015-06-14 16:07:19 +02:00
Laurent Destailleur
c4ff9c326a Merge branch 'marcosgdf-bug-2837' into 3.5 2015-06-14 16:06:24 +02:00
Laurent Destailleur
d0b2c492a0 Merge branch 'bug-2837' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-2837

Conflicts:
	ChangeLog
 2015-06-14 16:06:14 +02:00
Laurent Destailleur
288ae5de78 Merge branch 'marcosgdf-bug-2861' into 3.5 2015-06-14 16:04:02 +02:00
Laurent Destailleur
e915a54c39 Merge branch 'bug-2861' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-2861

Conflicts:
	ChangeLog
 2015-06-14 16:03:44 +02:00
Laurent Destailleur
f8d2e93878 Merge pull request #3044 from hregis/3.5_bug 
Fix: select date problem with mobile device (#3039)
 2015-06-14 15:29:35 +02:00
Regis Houssin
b96ed08260 Fix: select date problem with mobile device (#3039) 2015-06-14 12:46:27 +02:00
Regis Houssin
cf857b712a Fix: select date problem with mobile device (#3039) 2015-06-14 12:33:26 +02:00
Laurent Destailleur
fdced80a48 Merge pull request #3035 from marcosgdf/bug-2786 
FIX #2786 Objectline_add template shows "0" for non-vat suppliers
 2015-06-14 02:15:27 +02:00
Laurent Destailleur
a9bf38b8d3 Merge pull request #3022 from marcosgdf/bug-2976 
FIX Close bug #2976: "Report" tab is the current tab but it is not marked as selected by the UI
 2015-06-14 02:03:39 +02:00
Laurent Destailleur
f67af6dac5 Merge pull request #3026 from marcosgdf/bug-2891 
FIX Close bug #2891 Category hooks do not work
 2015-06-14 01:40:12 +02:00
Marcos García de La Fuente
ea625628ce Fix Close bug #2786 Objectline_add template shows "0" for non-vat suppliers 2015-06-13 03:39:06 +02:00
Marcos García de La Fuente
1215502927 Fix Close bug #2814 JPEG photos are not displayed in Product photos page 2015-06-13 03:11:17 +02:00
Juanjo Menent
ab3190df25 Merge pull request #3010 from GPCsolutions/3.6-3009 
FIX #3009: Better filtering to prevent SQL injection
 2015-06-12 21:25:53 +02:00
Marcos García de La Fuente
f9574fa458 FIX Close #2835 Customer prices of a product shows incorrect history order 2015-06-12 19:05:08 +02:00
Marcos García de La Fuente
2051a66cd7 FIX Close #2837 Product list table column header does not match column body 2015-06-12 18:46:05 +02:00
Marcos García de La Fuente
e3aa63f3c3 Added log 2015-06-12 18:33:37 +02:00
Marcos García de La Fuente
0335892521 FIX Close bug #2861 Undefined variable $res when migrating from 3.6.2 to 3.7.0 2015-06-12 18:31:49 +02:00
Marcos García de La Fuente
300cfd2293 FIX Close bug #2891 Category hooks do not work 2015-06-12 16:10:23 +02:00
Marcos García de La Fuente
87a00d6924 FIX Close bug #2976: "Report" tab is the current tab but it is not marked as selected by the UI 2015-06-12 15:02:05 +02:00
Florian HENRY
96ce5ab617 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2015-06-11 12:11:18 +02:00
Raphaël Doursenaud
d89955047b FIX #3009: Better filtering to prevent SQL injection 2015-06-11 10:37:30 +02:00
Laurent Destailleur
f9d85973aa Merge remote-tracking branch 'origin/3.5' into 3.6 2015-06-08 18:18:37 +02:00