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

57066 Commits

Author SHA1 Message Date
florian HENRY
0d85eb52c5 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0 2018-08-03 17:10:26 +02:00
florian HENRY
615ed11534 fix bad use of test_sql_and_script_inject return int not value tested 2018-08-03 17:09:58 +02:00
atm-quentin
09dfcc6016 FIX exclude element of the select 2018-08-03 14:54:21 +02:00
Philippe
61e1f0508d FIX : Search on Ref project on order list 2018-08-03 11:08:09 +02:00
ATM-Nicolas
70adfb135d FIX : Missing behavior 2018-08-03 09:51:29 +02:00
Laurent Destailleur
6010d9de4b
Merge pull request #9158 from atm-gauthier/7.0_missing_hook 
FIX : missing hook to edit sql
 2018-08-02 18:36:25 +02:00
Laurent Destailleur
17ed19503c Code comment 2018-08-02 17:51:04 +02:00
Laurent Destailleur
e85ec19018
Merge pull request #9093 from atm-gauthier/FIX_filters 
FIX : page must always be 0 when we search
 2018-08-02 17:48:35 +02:00
Laurent Destailleur
b5a0e14ffe
Merge pull request #9185 from atm-john/fix_situation_total_calcul 
Important: fix situation line's total
 2018-08-02 17:45:44 +02:00
ATM-Nicolas
f3090e4819 FIX : Wrong variable and trigger name 2018-08-02 16:05:54 +02:00
Juanjo Menent
5b3c6de06c
Merge pull request #9184 from atm-gauthier/7.0_fix_extrafieldkey 
FIX : extrafieldkey
 2018-08-02 11:24:19 +02:00
Juanjo Menent
1fbbaf2895
Merge pull request #9180 from atm-florian/7.0 
FIX: keep context filter on contact list on change column displayed
 2018-08-02 11:20:25 +02:00
Juanjo Menent
ce49230d71
Merge pull request #9177 from ATM-Nicolas/fix_preselect_project 
FIX : Keep same project when creating shipping from order
 2018-08-02 11:18:39 +02:00
florian HENRY
ceb85cfa45 fix : odt project and task extrafields management 2018-07-31 17:29:08 +02:00
gauthier
cadf931e8d FIX : extrafieldkey 2018-07-31 15:02:51 +02:00
John BOTELLA
4ddca02bb9 fix situation line's total 2018-07-31 14:58:33 +02:00
ATM-Nicolas
b9a44fc76b FIX : Wrong position of firstname lastname 2018-07-31 12:15:18 +02:00
florian HENRY
5d19361782 fix: keep context filter on contact list on change column displayed 2018-07-31 11:39:54 +02:00
ATM-Nicolas
1536bbc65e FIX : Keep same project when creating shipping from order 2018-07-30 15:16:53 +02:00
tarrsalah
8278a9fa52 FIX filter supplier invoice list by societe name. 2018-07-29 13:18:05 +01:00
Frédéric FRANCE
7dada7ae8e
fix #8820 2018-07-29 09:15:42 +02:00
Laurent Destailleur
894f484de8 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-07-27 12:34:02 +02:00
Laurent Destailleur
83ae27d122 FIX Deletion of files in migration 2018-07-27 12:33:36 +02:00
gauthier
c95d6271a9 FIX : missing hook to edit sql 2018-07-25 11:15:13 +02:00
Philippe
d7f58d0087 FIX search on ref project on propal list 2018-07-24 20:28:49 +02:00
Laurent Destailleur
927727edf3 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-07-24 19:22:12 +02:00
Laurent Destailleur
20f178fdfe Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/lib/functions.lib.php
 2018-07-24 19:22:00 +02:00
Laurent Destailleur
f50aa03187
Merge pull request #9112 from atm-gauthier/FIX_multientity_replenish 
FIX: stock replenish with multientity
 2018-07-24 18:10:00 +02:00
Laurent Destailleur
e9eb8da61b
Update replenish.php 2018-07-24 18:09:50 +02:00
Frédéric FRANCE
bde30b85ad
use defaut currency for supplier order 2018-07-24 17:06:12 +02:00
Laurent Destailleur
3bdf7d411d
Merge pull request #9125 from atm-john/fix_php7_warning_mysql 
Fix: Warning: Use of undefined constant MYSQL_NUM - assumed 'MYSQL_NU…
 2018-07-24 16:56:10 +02:00
Laurent Destailleur
8866b8eb1d
Merge pull request #9133 from frederic34/patch-12 
__NEXT_MONTH __PREVIOUS_MONTH give day instead month
 2018-07-24 16:54:04 +02:00
Frédéric FRANCE
4341e367d2
remove % in supplier order pdf 2018-07-23 10:30:28 +02:00
Frédéric FRANCE
d582f72bd9
__NEXT_MONTH __PREVIOUS_MONTH give day instead month 2018-07-22 17:27:02 +02:00
Laurent Destailleur
a1180f79bd Fix missing customer code and ref customer 2018-07-21 12:56:18 +02:00
John BOTELLA
1e986bc39a Fix: Warning: Use of undefined constant MYSQL_NUM - assumed 'MYSQL_NUM' (this will throw an Error in a future version of PHP) 2018-07-20 11:51:01 +02:00
Laurent Destailleur
7fcec5f6c3 Fix duplicate tab "contact" on thirdparty 2018-07-17 13:54:13 +02:00
Laurent Destailleur
45a45b0dec NEW Can enable a module, even external module, from command line 
Conflicts:
	htdocs/install/upgrade2.php
 2018-07-16 15:35:00 +02:00
gauthier
33aa373362 FIX: when stock is empty for current entity but > 0 in other entity, until this commit product wasn't displaied on replenishment, it must depends on multientity stock sharing 2018-07-16 15:27:37 +02:00
Laurent Destailleur
e92052353d
Merge pull request #9026 from inoveaconseil/FixExtrafieldResource 
Fix extrafields resource
 2018-07-15 20:13:24 +02:00
Laurent Destailleur
b690306b70
Merge pull request #9027 from hregis/7.0_price 
Fix: avoid a non numeric value !!
 2018-07-15 20:11:50 +02:00
atm-ph
0c252d9778 Fix user rights overrided by user group rights 2018-07-11 18:09:29 +02:00
gauthier
80ff7fa86f FIX : case when we valid form with keyboard 2018-07-11 15:18:30 +02:00
gauthier
103c7e6d06 FIX : page must always be 0 when we search (to avoid case : when we're on page 3 and we're looking for a precise thirdparty, we stay on page 3 and nothing's displaied) 2018-07-11 09:51:36 +02:00
Regis Houssin
f52187e829 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_price 2018-07-11 08:22:13 +02:00
Laurent Destailleur
aeb5f5e4f3 Fix phpcs 2018-07-10 13:56:03 +02:00
Laurent Destailleur
bda142d82d
Update commande.class.php 2018-07-10 11:10:55 +02:00
Laurent Destailleur
c0d6aee040
Update propal.class.php 2018-07-10 11:10:01 +02:00
Laurent Destailleur
ed3023f7d9
Update propal.class.php 2018-07-10 11:09:08 +02:00
Laurent Destailleur
dc7fcc009b
Update propal.class.php 2018-07-10 10:56:45 +02:00
Laurent Destailleur
8e0a663b7c Code comment 2018-07-10 10:53:59 +02:00
Marc de Lima Lucio
2ba7c07574 FIX: propal: correctly preset project when creating with origin/originid 2018-07-09 17:34:31 +02:00
Laurent Destailleur
8184eff66c Fix for #9079 2018-07-09 15:25:14 +02:00
Laurent Destailleur
c33aaa076d FIX #8984 button create expense report 2018-07-09 14:35:22 +02:00
Laurent Destailleur
e427496ddf FIX Injection 2018-07-09 14:13:01 +02:00
John BOTELLA
1daba56bbc Fix count(): Parameter must be an array or an object that implements Countable 2018-07-09 10:05:53 +02:00
Laurent Destailleur
2a676b414a
Merge pull request #9024 from atm-maxime/fix_link_create_event 
Fix link to create event had no socid if from thirdparty card
 2018-07-06 14:26:38 +02:00
Laurent Destailleur
2113965b57
Update html.formactions.class.php 2018-07-06 14:26:21 +02:00
Laurent Destailleur
2cdd9adc6e
Merge pull request #9023 from atm-maxime/fix_stocklist 
Fix filters not saved when ordering
 2018-07-06 14:23:10 +02:00
Laurent Destailleur
3b8ecb18ab
Merge pull request #9044 from hregis/7.0_loan 
Fix: missing "paid" field
 2018-07-06 13:03:37 +02:00
Laurent Destailleur
0587e73272 FIX Pagination on related item pages 2018-07-05 15:53:28 +02:00
Inovea Conseil
d53f03b596
Update after comment 2018-07-05 09:14:36 +02:00
Regis Houssin
875cee84c7 Fix: missing "paid" field 2018-07-03 13:47:53 +02:00
Laurent Destailleur
0138b0e0b7 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/html.form.class.php
 2018-07-03 10:01:30 +02:00
Laurent Destailleur
9c5d34fc5f Fix translation 2018-07-02 12:26:32 +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
Regis Houssin
4925624ed9 Fix: avoid NULL value when "subprice" is 0 2018-06-30 10:38:30 +02:00
Regis Houssin
964f11491f Revert "Fix: avoid a non numeric value !!" 
This reverts commit 2824afa75c.
 2018-06-30 10:26:50 +02:00
Laurent Destailleur
bc632c9ab7
Merge pull request #9019 from atm-gauthier/6.0_fix_getentity 
FIX : getEntity project and not projet
 2018-06-30 01:15:23 +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
a6c6bbe16d
Merge pull request #9029 from hregis/6.0_multicompany 
Fix: broken feature with edit in place
 2018-06-29 19:40:17 +02:00
Laurent Destailleur
3f2b3c0840 FIX #9032 2018-06-29 19:38:12 +02:00
Laurent Destailleur
c4143763be
Update step1.php 2018-06-29 19:23:17 +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
Regis Houssin
41709f07d0 Fix: #9032 Vulnerability 2018-06-29 18:18:10 +02:00
Regis Houssin
2d13b5b59d Fix: broken feature with edit in place 2018-06-29 15:57:34 +02:00
Regis Houssin
2824afa75c Fix: avoid a non numeric value !! 2018-06-29 11:25:30 +02:00
Inovea Conseil
c4513a755d Fix extrafields resource 2018-06-28 16:39:37 +02:00
Maxime Kohlhaas
5756955d55 Fix link to create event had no socid if from thirdparty card 2018-06-28 14:27:59 +02:00
Maxime Kohlhaas
3babdb9798 Fix filters not saved when ordering 2018-06-28 13:45:30 +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
gauthier
d8ca9f2947 FIX : we must see number of all shared projects 2018-06-27 17:26:04 +02:00
gauthier
86a58def3b FIX : getEntity project and not projet 2018-06-27 17:13:50 +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
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
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
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
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
Ferran Marcet
a21e138c70 Fix: Avoid converting into reduction twice and draft invoice 2018-06-15 11:19:04 +02:00
atm-ph
cb3704b67e Fix can't add an attribute simply 2018-06-15 11:02:46 +02:00
Regis Houssin
f9a86ba43f Fix: MEMBER_MODIFY trigger not called if i change only extrafields 2018-06-14 14:01:05 +02:00
gauthier
e9d65ea751 FIX : need to filter on aa.entity for same accounting accounts available in several entities 2018-06-14 11:56:22 +02:00
Marc de Lima Lucio
1dec4c4320 FIX: supplier order: product supplier ref not saved on addline 2018-06-14 10:37:40 +02:00
Laurent Destailleur
4c2af6fc70 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/html.form.class.php
 2018-06-13 23:04:08 +02:00
Laurent Destailleur
09c92b7cc8
Merge pull request #8936 from atm-gauthier/6.0_fix_dont_remove_all_fourn_rights 
FIX : If we enable 3 steps for supplier order approbation, we must no…
 2018-06-13 21:36:01 +02:00
Laurent Destailleur
c586f2ecf7
Merge pull request #8957 from altatof/FIX_TOTAL_HT_DEVISE 
FIX : pu_ht_devise was not converted to numeric so decimals were lost when calculating total_ht_devise
 2018-06-13 21:20:42 +02:00
Laurent Destailleur
b5cd722eb1
Merge pull request #8917 from atm-gauthier/6.0_fix_apply_reduc 
FIX : sometimes amounts are identical but php find them different.
 2018-06-13 20:34:59 +02:00
Laurent Destailleur
76ee88f0b1
Merge pull request #8951 from fappels/7.0_fix_ErrorProductAlreadyExists 
Fix Wrong error for duplicate ref if barcode enabled but not set.
 2018-06-13 20:19:55 +02:00
Laurent Destailleur
eabb3e9cd3
Merge pull request #8930 from hregis/7.0_non-numeric 
FIX wrong var name $search_month_lim
 2018-06-13 20:09:13 +02:00
Laurent Destailleur
5fcfad5966
Merge pull request #8918 from atm-gauthier/6.0_fix_entity_select_prod_fourn_prices 
FIX : entity test must be on product_fourn_price table and not product table
 2018-06-13 20:08:25 +02:00
Laurent Destailleur
3f7f77ce95
Merge pull request #8923 from atm-florian/7.0 
fix error display
 2018-06-13 20:02:45 +02:00
Laurent Destailleur
fdc90da408
Update card.php 2018-06-13 20:02:38 +02:00
Laurent Destailleur
4c1bb9d28f
Merge pull request #8948 from glu000/7.0 
Fix #8946
 2018-06-13 20:01:29 +02:00
Laurent Destailleur
f07408c6c3
Merge pull request #8929 from ATM-Marc/FIX_7.0_extrafields_intervention 
FIX: intervention: extrafield error when calling insertExtrafields
 2018-06-13 20:00:48 +02:00
altatof
d42f00bca9 FIX : pu_ht_devise was not converted to numeric so decimals were lost 
when clculating total_ht_devise
 2018-06-13 16:35:52 +02:00
fappels
a86c90fed1 Fix Wrong error for duplicate ref if barcode enabled but not set. 2018-06-12 16:38:42 +02:00
Günter Lukas
fcbf50467e
Update user.class.php 2018-06-12 09:52:55 +02:00
Laurent Destailleur
31eeaf9914 Trans 2018-06-09 13:46:42 +02:00
gauthier
baf9d4a806 FIX : If we enable 3 steps for supplier order approbation, we must not delete all fourn rights def. 2018-06-08 17:11:59 +02:00
Regis Houssin
7ce2ebf1a9 Fix: wrong var name 2018-06-07 16:25:47 +02:00
Marc de Lima Lucio
d69fae72c7 FIX: intervention: extrafield regression in commit b5f37301a5 2018-06-07 15:17:22 +02:00
florian HENRY
75305e095d Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0 2018-06-05 20:39:53 +02:00
florian HENRY
8031ef49f2 fix error return 2018-06-05 20:38:55 +02:00
Laurent Destailleur
30b04c0d3d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/files.lib.php
 2018-06-05 18:16:32 +02:00
Laurent Destailleur
4c21ad4e4e FIX: dol_delete_file must work in a context without db handler loaded 
Conflicts:
	htdocs/core/lib/files.lib.php
 2018-06-05 18:12:14 +02:00
Laurent Destailleur
9c32e49bd3 FIX: dol_delete_file must work in a context without db handler loaded 2018-06-05 18:05:33 +02:00
gauthier
45ecb0258b FIX : entity test must be on product_fourn_price table and not product table 2018-06-05 12:41:38 +02:00
gauthier
77e7932671 FIX : sometimes amounts are identical but php find them different. 2018-06-05 11:33:58 +02:00
Laurent Destailleur
3368e35502 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-06-04 14:09:34 +02:00
Laurent Destailleur
de2ffa1122 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/comm/action/listactions.php
 2018-06-04 14:09:17 +02:00
Laurent Destailleur
840330deea
Merge pull request #8905 from atm-greg/Add_supplier_proposals_in_suppliers_linkedObjects 
Add supplier proposal in linkedObjects type select of the suppliers
 2018-06-04 13:46:36 +02:00
atm-greg
0785029fe0 Add supplier proposal in linkedObjects type select of the suppliers 2018-05-31 10:46:50 +02:00
florian HENRY
b996237142 fix: when agenda is filterd with "todo" event, do not display "not 
applicable" event
 2018-05-30 13:37:17 +02:00
Laurent Destailleur
0412264418 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2018-05-30 12:05:54 +02:00
Laurent Destailleur
60321aabd8 Fix regression 2018-05-30 11:59:23 +02:00
Laurent Destailleur
3733169120 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/recap-compta.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2018-05-30 11:09:53 +02:00
Laurent Destailleur
2df2071bae Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-05-30 11:05:12 +02:00
Laurent Destailleur
02da9b6992 FIX #8893 to get formatted price as substitution vars 2018-05-30 11:04:44 +02:00
Laurent Destailleur
7590df85e6
Merge pull request #8887 from atm-florian/6.0 
add hook on balence pages
 2018-05-30 10:47:59 +02:00
Laurent Destailleur
e57ceab5de
Update fournisseur.commande.class.php 2018-05-30 10:45:06 +02:00
ATM-Nicolas
48a315f6cd FIX : Bad substitution key used for default send proposal email 2018-05-30 10:14:34 +02:00
florian HENRY
b65b545e0f add hook on balence pages 2018-05-29 16:29:14 +02:00
ATM-Nicolas
6b0b975ffd FIX : Keep supplier proposal price for supplier order 2018-05-29 11:21:30 +02:00
Laurent Destailleur
7b824e3c48 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-05-29 10:13:48 +02:00
Laurent Destailleur
7eea70ebc8 FIX #8858 #8860 Backport better compatibility fix 2018-05-29 10:13:34 +02:00
Frédéric FRANCE
091fb81368
Update list.php 2018-05-26 09:49:13 +02:00
Laurent Destailleur
bf81b755f9 Fix state code for payment from indonesia 2018-05-25 16:21:13 +02:00
Laurent Destailleur
37dcfe4a46 FIX button to pay still visible when amount null used 2018-05-25 16:00:23 +02:00
Laurent Destailleur
943d1dce2e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-05-25 13:15:38 +02:00
Laurent Destailleur
8a64ee2297 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/commande/list.php
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/list.php
	htdocs/societe/card.php
 2018-05-25 13:14:58 +02:00
Laurent Destailleur
1a1f0fbc62
Merge pull request #8839 from ATM-Nicolas/fix_shipping_fetch 
FIX : Fetch shipping will now fetch project id
 2018-05-25 11:46:06 +02:00
Laurent Destailleur
131ddd6984
Merge pull request #8827 from ATM-Marc/FIX_shipment_fk_project 
FIX: shipment: fk_proje(c)t not handled in fetch() and update() methods
 2018-05-25 11:12:39 +02:00
Laurent Destailleur
b25c7e44d3
Merge pull request #8816 from atm-gauthier/6.0_fix_test_before_delete_invoice 
FIX : test is_erasable() must be done before call function delete()
 2018-05-25 11:05:20 +02:00
Laurent Destailleur
0a581e48d4
Update card.php 2018-05-25 11:04:04 +02:00
Laurent Destailleur
04586fab66
Merge pull request #8824 from ggg44473/7.0 
Fix sql error accounting account
 2018-05-25 10:41:16 +02:00
Günter Lukas
1b237a75b9
Update card.php 2018-05-24 13:31:23 +02:00
atm-quentin
eb224e43a5 FIX missing filters during ordering 2018-05-24 10:41:24 +02:00
Laurent Destailleur
4967c678b8 Fix translation 2018-05-23 18:05:19 +02:00
Laurent Destailleur
3a06918b16 FIX Missing extrafields in export of stock or products 2018-05-23 18:00:27 +02:00
Laurent Destailleur
d1d8494666 FIX Missing extrafields in export 2018-05-23 17:48:18 +02:00
ATM-Nicolas
734ecbc9b5 FIX : Fetch shipping will now fetch project id 2018-05-23 09:47:29 +02:00
Laurent Destailleur
2a579b707a FIX javascript showempty error 
FIX Contact tab not visible when using canvas
 2018-05-22 19:43:28 +02:00
Laurent Destailleur
be21405d21 Fix missing error message 2018-05-22 19:24:56 +02:00
ATM-Nicolas
a455f60c42 FIX : Add calls to fetchComments function 2018-05-22 16:07:32 +02:00
ATM-Nicolas
d875553648 FIX : Remove fetchComments from project and task fetch function 2018-05-22 16:03:03 +02:00
ATM-Nicolas
f46d514586 Merge branch '7.0' of github.com:Dolibarr/dolibarr into fix_comments_on_tasks 2018-05-22 15:12:24 +02:00
Laurent Destailleur
8951c4a7a5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-05-21 23:36:47 +02:00
Laurent Destailleur
afa57fd66d Fix syntax error 2018-05-21 23:33:20 +02:00
Laurent Destailleur
69141c9493 Fix PSR True->true and GETPOST file name for local checksum check 2018-05-21 22:24:27 +02:00
Laurent Destailleur
e5561ecdfb Remove useless files 2018-05-21 22:14:15 +02:00
Marc de Lima Lucio
c9222adf6d FIX: shipment: fk_proje(c)t not handled in fetch() and update() methods 2018-05-21 16:22:06 +02:00
Philippe
4d72573484 Merge branch '6.0' of https://github.com/Dolibarr/dolibarr into 6.0 2018-05-21 14:44:22 +02:00
Sean Wang
8e397b772f Fix sql error 2018-05-21 14:19:41 +08:00
gauthier
4c3f9d6d5e FIX : test is_erasable() must be done before call function delete() too to avoid delete invoice with &action=delete in url 2018-05-18 15:20:16 +02:00