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

52273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
c7aa486d93 Merge pull request #5282 from atm-ph/fix_3.9_miss_value_extrafield_on_builddoc 
Fix builddoc with odt lost value of extrafields as "sellist" on view …
 2016-06-04 14:38:12 +02:00
phf
01b881a0a6 Fix builddoc with odt lost value of extrafields as "sellist" on view card 2016-06-04 13:24:42 +02:00
Laurent Destailleur
5a105b75ec Merge pull request #5276 from atm-maxime/fix_import_mapping 
FIX #5229
 2016-06-04 11:35:27 +02:00
Juanjo Menent
43d475aa42 Merge pull request #5272 from simnandez/3.9 
Fix issues with strict mode
 2016-06-04 10:07:01 +02:00
Laurent Destailleur
32b6766a7d FIX #5195 2016-06-04 01:50:01 +02:00
Maxime Kohlhaas
a1c7632a50 Fix import mapping #5229 2016-06-04 01:28:51 +02:00
Laurent Destailleur
085fa6902b Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/contrat/list.php
	htdocs/fourn/ajax/getSupplierPrices.php
 2016-06-04 00:58:16 +02:00
Laurent Destailleur
609cc1dd70 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-06-04 00:53:09 +02:00
Laurent Destailleur
9c3365aefc FIX #5163 2016-06-04 00:52:55 +02:00
Laurent Destailleur
6cef3b8a96 Merge pull request #5273 from atm-maxime/fix_import_model_type_size 
Fix import model not correctly saved #5185
 2016-06-04 00:18:23 +02:00
Maxime Kohlhaas
8901b99e2d Fix import model not correctly saved #5185 2016-06-04 00:14:08 +02:00
Laurent Destailleur
b47db3e9e1 Merge pull request #5266 from atm-maxime/fix_project_time_spent_access 
Fix access to project task time spent creation #5249
 2016-06-04 00:13:32 +02:00
Laurent Destailleur
b9feae0883 Merge pull request #5270 from atm-maxime/fix_pmp_when_stock_enabled 
Fix pmp when stock enabled
 2016-06-04 00:12:53 +02:00
Juanjo Menent
66c73015b2 Fix issues with strict mode 2016-06-03 23:58:54 +02:00
Juanjo Menent
9e85ae3d47 Merge remote-tracking branch 'origin/3.9' into 3.9 2016-06-03 23:53:14 +02:00
Maxime Kohlhaas
8b0b3b1a9d PMP available only if stock module enabled 2016-06-03 23:49:34 +02:00
Laurent Destailleur
d20d88e1af Merge pull request #5265 from atm-ph/fix_3.8_soc.php_with_wrong_id 
Fix #4632
 2016-06-03 23:43:54 +02:00
Maxime Kohlhaas
c9c7045a6f Fix access to project task time spent creation #5249 2016-06-03 23:34:37 +02:00
phf
778b05c341 Fix #4632 2016-06-03 23:06:53 +02:00
Juanjo Menent
fde6909530 Merge pull request #5258 from atm-maxime/3.8 
Fix SQL error on order stats
 2016-06-03 16:19:56 +02:00
Maxime Kohlhaas
ab44adc6d5 Fix SQL error on order stats 2016-06-02 12:37:37 +02:00
Laurent Destailleur
f07559a784 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-06-02 11:44:19 +02:00
Frédéric FRANCE
19f6aa805b select engine for code 128 didn't work 2016-06-02 11:41:26 +02:00
Laurent Destailleur
f40f5e28ad Merge pull request #5254 from atm-florian/3.9_fix5209 
FIX #5209
 2016-06-02 10:05:37 +02:00
Laurent Destailleur
c663ca13b8 Fix edit left menu 2016-06-01 21:41:47 +02:00
Laurent Destailleur
780d1628a9 Missing trans 2016-06-01 21:19:21 +02:00
Laurent Destailleur
bf5fbd3a80 FIX Infinite loop on menu tree output for edition 
FIX Can show tree of entries added by external modules using fk_mainmenu
and fk_leftmenu instead of fk_menu.
 2016-06-01 21:14:28 +02:00
Laurent Destailleur
ee420b79b1 FIX Infinite loop on menu tree output for edition 
FIX Can show tree of entries added by external modules using fk_mainmenu
and fk_leftmenu instead of fk_menu.
 2016-06-01 17:52:06 +02:00
Juanjo Menent
7773afcbbe Merge remote-tracking branch 'upstream/3.9' into 3.9 2016-06-01 10:36:18 +02:00
Florian HENRY
41a41f8931 FIX #5209 2016-05-31 22:55:49 +02:00
Laurent Destailleur
0d277083e6 Fix duplicate translation 2016-05-30 19:56:59 +02:00
Laurent Destailleur
58ba5838ce Fix alias name already visible into banner 2016-05-30 19:41:28 +02:00
Laurent Destailleur
460d7ce915 FIX Split of credit note into discount page generates records not 
correctly recognised as credit note.
 2016-05-30 19:38:28 +02:00
Laurent Destailleur
89cb122474 Merge branch '3.9' of github.com:Dolibarr/dolibarr into 3.9 2016-05-30 18:15:19 +02:00
Laurent Destailleur
ed148f70b3 FIX Filter on assigned to was preselected on current user on list "All 
events" (instead of no filtering)
 2016-05-30 18:12:27 +02:00
Laurent Destailleur
3cc8207bb7 FIX Filter on category tag for suppliers 2016-05-30 17:20:34 +02:00
Laurent Destailleur
2290f6a123 FIX Menu statistics was not visible if module proposal was not enabled 2016-05-30 13:11:44 +02:00
Laurent Destailleur
a1a335025f FIX #5230 2016-05-29 12:05:11 +02:00
Laurent Destailleur
c2d8bd99dc Merge pull request #5244 from atm-gauthier/3.8_fix_mergepropal 
FIX : same page added several times on mergepropal option
 2016-05-29 12:03:35 +02:00
Laurent Destailleur
3f49f0df33 Merge pull request #5245 from atm-gauthier/3.8_fix_sql_error_on_facture_create 
FIX : SQL error function on getAvailableDiscounts function, on bill c…
 2016-05-29 11:58:28 +02:00
Laurent Destailleur
b8d5d6a383 Fix bad placeholder 2016-05-26 19:38:52 +02:00
Juanjo Menent
071a230000 Merge remote-tracking branch 'upstream/3.9' into 3.9 
Conflicts:
	htdocs/compta/localtax/quadri_detail.php
 2016-05-26 10:46:44 +02:00
gauthier
71ee941cf8 FIX : SQL error function on getAvailableDiscounts function, on bill create mode if socid is empty 2016-05-25 12:25:39 +02:00
gauthier
1ce91bac06 FIX : same page added several times on mergepropal option 2016-05-25 11:25:19 +02:00
Laurent Destailleur
24d7c6aae7 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-05-23 12:27:15 +02:00
Laurent Destailleur
e2e95641a3 FIX Search supplier ref on contract 2016-05-23 12:27:02 +02:00
Laurent Destailleur
9b5dc9da3c Merge pull request #5237 from EuskalMoneta/bug-5236 
FIX #5236 Cron module activated but "Modules tools" does not appear in the left menu.
 2016-05-22 19:31:42 +02:00
Xebax
2355a0c38c FIX #5236 Cron module activated but "Modules tools" does not appear in the left menu. 2016-05-22 17:15:22 +02:00
Laurent Destailleur
5e9809ccb6 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-05-22 14:34:31 +02:00
Laurent Destailleur
ebf31d87ea Merge pull request #5234 from frederic34/patch-7 
Fix next month or next year in opensurvey
 2016-05-22 14:23:30 +02:00