Laurent Destailleur
|
af21222c30
|
Fix translation
|
2018-07-02 11:47:04 +02:00 |
|
Laurent Destailleur
|
e8b97b0be4
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-07-02 11:33:49 +02:00 |
|
Laurent Destailleur
|
11021353da
|
Fix text in payment area of crabe pdf
|
2018-07-02 11:33:33 +02:00 |
|
Laurent Destailleur
|
03306fa56e
|
Merge pull request #9022 from atm-maxime/7.0
Fix : division by 0 on homepage if nothing to do
|
2018-06-29 19:58:48 +02:00 |
|
Laurent Destailleur
|
932ff0be18
|
Trans
|
2018-06-29 19:16:29 +02:00 |
|
Laurent Destailleur
|
ca8144c5ea
|
Fix error message
|
2018-06-29 19:08:35 +02:00 |
|
Laurent Destailleur
|
2175a012e1
|
Fix lang
|
2018-06-29 18:23:59 +02:00 |
|
Maxime Kohlhaas
|
7ebf54fbea
|
Fix : division by 0 on homepage if nothing to do
|
2018-06-28 12:54:19 +02:00 |
|
Laurent Destailleur
|
da138db528
|
FIX combo into popup become crazy with IE10
Conflicts:
htdocs/asset/card.php
htdocs/modulebuilder/template/myobject_card.php
|
2018-06-28 12:16:12 +02:00 |
|
Laurent Destailleur
|
ed2ec78332
|
FIX combo of stock in popup are crazy in IE
|
2018-06-28 12:11:00 +02:00 |
|
Laurent Destailleur
|
aa37786596
|
Fix migration errors reported by Softaculous
|
2018-06-26 11:51:49 +02:00 |
|
Laurent Destailleur
|
7f8570f720
|
Fix lang loading
|
2018-06-26 00:48:43 +02:00 |
|
Laurent Destailleur
|
52eddbf809
|
Sync transifex
|
2018-06-26 00:29:50 +02:00 |
|
Laurent Destailleur
|
9f77ea0ece
|
Code comment
|
2018-06-25 17:05:15 +02:00 |
|
Laurent Destailleur
|
9b46ae50f0
|
Fix left join on expensereport lines
|
2018-06-25 16:25:37 +02:00 |
|
Laurent Destailleur
|
36402c22ee
|
FIX SQL Injections reported by mu shcor (ADLab of Venustech)
|
2018-06-25 14:06:09 +02:00 |
|
Laurent Destailleur
|
d9fc1e0b5d
|
Fix param to avoid to create holiday or expense report in wrong entity.
|
2018-06-25 10:09:01 +02:00 |
|
Laurent Destailleur
|
97976fbb43
|
Fix type of parameter must be string
|
2018-06-25 09:19:45 +02:00 |
|
Laurent Destailleur
|
bc71685258
|
Fix migration error
|
2018-06-25 08:30:37 +02:00 |
|
Laurent Destailleur
|
16f940b637
|
Prepare 7.0.4
|
2018-06-23 14:55:33 +02:00 |
|
Laurent Destailleur
|
edec89ef1e
|
Prepare 7.0.3
|
2018-06-23 12:44:30 +02:00 |
|
Laurent Destailleur
|
ca04ffe420
|
Load lang
|
2018-06-22 17:07:49 +02:00 |
|
Laurent Destailleur
|
d458b383ad
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-06-22 15:29:44 +02:00 |
|
Laurent Destailleur
|
533c19cc2c
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/accountancy/customer/list.php
htdocs/core/lib/functions.lib.php
|
2018-06-22 15:29:26 +02:00 |
|
Laurent Destailleur
|
8414ceaddb
|
Merge pull request #9000 from ATM-Marc/FIX_7.0_propal_contact_SHIPPING
FIX: proposal: missing contact type translation key
|
2018-06-22 15:16:56 +02:00 |
|
Laurent Destailleur
|
bd7277431f
|
Merge pull request #8986 from atm-greg/fix_desired_stock
FIX bad result on fetch ProductStockEntrepot
|
2018-06-22 15:01:19 +02:00 |
|
Laurent Destailleur
|
dab264c641
|
Merge pull request #8994 from hregis/6.0_multicompany
Fix: to avoid deleting line breaks
|
2018-06-22 15:00:26 +02:00 |
|
Laurent Destailleur
|
cfc8e8b0ef
|
Merge pull request #8972 from fmarcet/7.0
FIX Avoid converting into reduction twice and draft invoice
|
2018-06-22 14:35:26 +02:00 |
|
Laurent Destailleur
|
5bee324578
|
Update paiement.class.php
|
2018-06-22 14:34:59 +02:00 |
|
Laurent Destailleur
|
2d89d9634b
|
Fix search on extrafields
|
2018-06-20 23:16:06 +02:00 |
|
Laurent Destailleur
|
714057d435
|
Fix stats on project. Must use assignement on project as filter.
|
2018-06-20 21:31:37 +02:00 |
|
Laurent Destailleur
|
9f2437fa04
|
Fix missing field
|
2018-06-20 17:59:01 +02:00 |
|
Marc de Lima Lucio
|
2fab4d7f76
|
FIX: proposal: missing contact type translation key
|
2018-06-20 14:56:24 +02:00 |
|
Regis Houssin
|
8fc2f7441c
|
Fix: to avoid deleting line breaks
|
2018-06-20 09:06:16 +02:00 |
|
bgenere
|
403116898f
|
Fix cherry-pick
|
2018-06-19 18:25:52 +02:00 |
|
atm-greg
|
df056980b5
|
fix bad result on fetch ProductStockEntrepot
|
2018-06-19 10:46:07 +02:00 |
|
Laurent Destailleur
|
31067b6250
|
FIX picto for type in product link in accountany list is wrong
|
2018-06-18 14:43:32 +02:00 |
|
Laurent Destailleur
|
ce5514bd68
|
Fix sql begin at wrong place
|
2018-06-18 14:37:16 +02:00 |
|
Laurent Destailleur
|
5d6d43d539
|
Merge pull request #8964 from atm-gauthier/6.0_accounting_entity
FIX : need to filter on aa.entity for same accounting accounts available in several entities
|
2018-06-18 14:30:55 +02:00 |
|
Laurent Destailleur
|
16fee19b6f
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-06-18 13:20:11 +02:00 |
|
Laurent Destailleur
|
102f9aa84f
|
FIX Problems in accountancy module when using multicompany module.
|
2018-06-18 13:19:46 +02:00 |
|
gauthier
|
fed61930d5
|
FIX : clause must not be there
|
2018-06-18 11:37:15 +02:00 |
|
Laurent Destailleur
|
8c6f311aa6
|
Merge pull request #8974 from atm-ph/fix_7.0_addMoreActionsButtons_on_usercard
Fix missing hook on usercard (addMoreActionsButtons)
|
2018-06-18 11:18:12 +02:00 |
|
Laurent Destailleur
|
9cfc4a8d28
|
Merge pull request #8971 from atm-ph/fix_7.0_hook_getnomurltooltip
Fix can't add an attribute simply
|
2018-06-18 11:13:29 +02:00 |
|
Laurent Destailleur
|
95ee3325fc
|
Part of fix of #8972
|
2018-06-18 11:11:07 +02:00 |
|
Laurent Destailleur
|
3c55e50bac
|
Merge pull request #8966 from hregis/7.0_bug6
Fix: MEMBER_MODIFY trigger not called if i change only extrafields
|
2018-06-18 10:53:35 +02:00 |
|
Laurent Destailleur
|
95dfa1f7aa
|
Merge pull request #8973 from altatof/FIX_HTML_DETECTION
Fix <br/> detection
|
2018-06-18 10:42:02 +02:00 |
|
Laurent Destailleur
|
63fb82931c
|
Update functions.lib.php
|
2018-06-18 10:41:11 +02:00 |
|
atm-ph
|
3c80ce501b
|
Fix missing hook on usercard (addMoreActionsButtons)
|
2018-06-15 16:05:50 +02:00 |
|
altatof
|
5d6cd381b9
|
Fix <br/> detection
|
2018-06-15 15:59:14 +02:00 |
|