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

57354 Commits

Author SHA1 Message Date
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
atm-greg
2cdae2ec98 remove globalcard context 2018-06-18 11:30:38 +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-greg
72449ddef4 add hooks on stock replenish 2018-06-15 16:55:23 +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
BENKE Charlene
24d353c9a7 inversion of dateo and datee 2018-05-18 12:24:44 +02:00
Laurent Destailleur
7de812d2ed
Merge pull request #8793 from atm-john/Fix_situation_discount_used 
Fix creating next situation invoice if a discount was allready apply
 2018-05-18 12:18:58 +02:00
Laurent Destailleur
b5f37b2876
Merge pull request #8811 from fappels/7.0_fix_product_vat_update_errorhandling 
Fix product vat update error handling
 2018-05-18 12:00:03 +02:00
Laurent Destailleur
508f6c1a89 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-05-18 11:53:09 +02:00
Laurent Destailleur
6d0306f75a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2018-05-18 11:52:48 +02:00
Laurent Destailleur
5f8346f854 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-05-18 11:48:30 +02:00
Laurent Destailleur
492b1e7169 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-05-18 11:48:08 +02:00
Laurent Destailleur
75f5cdbc0f
Merge pull request #8810 from simnandez/7.0 
Fix: extrafiels is not passing orders to invoice
 2018-05-18 11:47:44 +02:00
Laurent Destailleur
24281028b7
Merge pull request #8807 from inoveaconseil/patch-2 
Fix missing params for commonGenerateDocument
 2018-05-18 11:43:11 +02:00
Laurent Destailleur
fa7f81c828 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-05-18 11:38:26 +02:00
Laurent Destailleur
a450f99e8a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/filefunc.inc.php
 2018-05-18 11:38:11 +02:00
Laurent Destailleur
162d271884
Merge pull request #8803 from atm-alexis/7.0_fix_task_contact_card_withoutproject 
FIX 7.0 task contact card without withproject parameters
 2018-05-18 11:29:11 +02:00
Laurent Destailleur
71f8971a8e
Merge pull request #8794 from ATM-Nicolas/fix_select_user 
FIX : Select user on add time spent form
 2018-05-18 11:27:05 +02:00
Laurent Destailleur
078ea2ce9b
Merge pull request #8790 from aspangaro/7.0-f1 
Fix : Double WHERE on admin/journal_list.php
 2018-05-18 11:20:05 +02:00
Laurent Destailleur
e2369dea29 FIX #8722 2018-05-18 11:17:21 +02:00
John
3dd11e1eaf Fix discount id 2018-05-18 11:02:04 +02:00
Juanjo Menent
dd259043cd Fix: Cashdesk does not apply multi-price or price per customer 2018-05-18 09:20:18 +02:00
Laurent Destailleur
26e10caa7d FIX #8813 2018-05-18 09:15:18 +02:00
fappels
90d2ccc79c Fix product vat update error handling 
Product vat update does not show update error if update result negative.
 2018-05-17 21:29:15 +02:00
Juanjo Menent
0aa8c6f498 Fix: extrafiels is not passing orders to invoice 2018-05-17 19:05:25 +02:00
Juanjo Menent
dc7a1610e7 Fix: extrafiels is not passing orders to invoice 2018-05-17 18:56:01 +02:00
Inovea Conseil
5804d1d4a3
Fix missing params for commonGenerateDocument 
ADD param moreparams for compatibility with commonGenerateDocument
 2018-05-17 10:16:44 +02:00
alexis Algoud
5c727c077b fix task contact card without withproject parameters 2018-05-16 16:34:19 +02:00
florian HENRY
630e38072b fix SQL and add hook 2018-05-15 17:02:54 +02:00
Alexandre SPANGARO
88bc2dd416 Correct insert 2018-05-14 20:59:38 +02:00
Laurent Destailleur
a46362a71f Prepare 7.0.3 2018-05-14 15:17:10 +02:00
Laurent Destailleur
c8e758411d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-05-14 15:16:33 +02:00
Laurent Destailleur
9552a914d8 FIX link for projets not linked to a thirdparties 2018-05-14 15:16:19 +02:00
ATM-Nicolas
ca09fddfb3 FIX : Select user on add time spent form 2018-05-14 15:16:07 +02:00
John
b42c87256c Fix_situation_discount_used 2018-05-14 14:55:33 +02:00
Alexandre SPANGARO
2f1ac6fad8 Fix : Double WHERE on admin/journal_list.php 2018-05-13 20:35:07 +02:00
Laurent Destailleur
842c6168a2 FIX #8762 2018-05-10 11:50:35 +02:00
Ferran Marcet
d1fd39936c Fix: Bug on invoice status list on left menu 2018-05-08 09:04:04 +02:00
Laurent Destailleur
20c50e809d Start 6.0.8 2018-05-06 10:43:40 +02:00
Laurent Destailleur
f15da0b980 Fix chart of account initial data for syscohada 2018-05-05 22:15:19 +02:00
Laurent Destailleur
9c68b81f59 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/projet/class/task.class.php
 2018-05-05 14:34:54 +02:00
Laurent Destailleur
8b4b786969
Merge pull request #8730 from atm-arnaud/FIX_project_list_label 
FIX label in getnomurl projectlist
 2018-05-05 13:26:11 +02:00
Laurent Destailleur
44cb60e61d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-05-05 13:25:00 +02:00
Laurent Destailleur
f6ca1eb624 Fix permission name 2018-05-05 13:24:46 +02:00
Laurent Destailleur
352676cd16
Merge pull request #8725 from fappels/Fix_7.0_ProductCombbination 
FIX delete all product variants of a parent product
 2018-05-05 13:14:55 +02:00
Laurent Destailleur
2f79a12c6b
Merge pull request #8720 from atm-florian/6.0_pjAndTskCounter 
fix project and task visibility same as list
 2018-05-05 13:13:25 +02:00
Laurent Destailleur
8d52c4f919
Merge pull request #8721 from atm-florian/6.0_fixtaskid 
fix taskid
 2018-05-05 13:13:04 +02:00
Laurent Destailleur
7bb9615cff
Merge pull request #8702 from atm-florian/6.0 
fix accountancy multientity
 2018-05-05 12:53:36 +02:00
Laurent Destailleur
08cf034e2f FIX to allow IRPF not null even if main VAT is null. 
From https://www.javierrguez.com/problema-facturas-irpf-sin-iva-dolibarr/
 2018-05-03 13:39:44 +02:00
atm-arnaud
6245f25deb FIX label in getnomurl projectlist 2018-05-03 11:47:31 +02:00
fappels
db76fd7895 Fix delete all product variants of a parent product 
User object missing
 2018-05-02 22:33:23 +02:00
florian HENRY
46e94af594 fix taskid 2018-05-02 19:46:04 +02:00
florian HENRY
3657857d21 fix project and task visibility same as list 2018-05-02 19:29:18 +02:00
atm-greg
942e2f40bf addline manage rank on its own if not provided 2018-05-02 17:07:27 +02:00
florian HENRY
886ad9d4b6 check eldy message 2018-05-02 08:45:18 +02:00
Laurent Destailleur
3340598cf8 FIX Projet is not prefilled when created from overwiew page 2018-05-01 14:15:11 +02:00
florian HENRY
b5d7206519 fix 6.0 accountancy multientity 2018-05-01 12:02:33 +02:00
Laurent Destailleur
d975dd507b
Revert "No display object line curreny if not necessary" 2018-05-01 11:17:47 +02:00
Laurent Destailleur
b1f1ddc6d0
Merge pull request #8354 from tuxgasy/5.0_multicurrency_objectline_print 
No display object line curreny if not necessary
 2018-05-01 11:15:31 +02:00
Laurent Destailleur
4eb4cf6506
Merge pull request #8693 from Librethic/fix-api-product-check-perm 
FIX : missing english name for object
 2018-05-01 10:19:27 +02:00
Laurent Destailleur
ab85fa8721 Backport EXPENSEREPORT_ALLOW_OVERLAPPING_PERIODS to solve blocking 
situation.
 2018-04-30 17:45:34 +02:00
Laurent Destailleur
e79c907ae0 Fix edit of capital 2018-04-30 11:01:33 +02:00
Laurent Destailleur
9a345e99ef Fix syntax error 2018-04-29 20:14:57 +02:00
jfefe
7cedf55c27 FIX : missing english name for object 
'product' is used by API to check perms and return a 401 error even if user has correct
permissions
 2018-04-27 20:54:48 +02:00
Laurent Destailleur
3b473943dc Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-27 12:44:07 +02:00
Laurent Destailleur
a80621471c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
 2018-04-27 12:42:18 +02:00
Laurent Destailleur
e5df7e206b
Merge pull request #8224 from atm-ph/fix_6.0_supplier_order_from_supplier_proposal 
Fix wrong price on supplier order line
 2018-04-27 12:20:49 +02:00
Laurent Destailleur
d179cafa9c
Update fournisseur.commande.class.php 2018-04-27 12:19:32 +02:00
Laurent Destailleur
ecd84f6c45
Update fournisseur.commande.class.php 2018-04-27 12:18:45 +02:00
Laurent Destailleur
4c87cbf644
Update card.php 2018-04-27 12:14:51 +02:00
Laurent Destailleur
8f60bd35a5
Merge pull request #8676 from atm-florian/7.0 
fix commonobject double style
 2018-04-27 10:14:13 +02:00
Laurent Destailleur
3faeb08b78
Merge pull request #8672 from ATM-Nicolas/fix_action_contact 
FIX : Related contact printed in societe agenda
 2018-04-27 10:00:18 +02:00
Laurent Destailleur
e2b936e2d8
Merge pull request #8666 from frederic34/patch-2 
Update api_products.class.php
 2018-04-27 09:45:40 +02:00
Laurent Destailleur
761d2b3667 FIX Not approved holidays must not be visible into timesheet 2018-04-26 17:44:36 +02:00
Marc de Lima Lucio
c044d9ab58 FIX: actioncomm export: type filtering not working 2018-04-25 16:20:09 +02:00
Laurent Destailleur
83b762b681 FIX CVE-2018-9019 2018-04-25 16:01:06 +02:00
florian HENRY
70961bd075 fix perms 2018-04-24 12:46:16 +02:00
florian HENRY
67329b8805 fix commonobject double style 2018-04-24 12:33:07 +02:00
ATM-Nicolas
736c56705b FIX : Related contact printed in societe agenda 2018-04-24 10:02:26 +02:00
ATM-Nicolas
3d179fb7d3 FIX : Fetch function will fetch comments 2018-04-24 09:17:03 +02:00
Laurent Destailleur
fdb3a11f34 FIX extrafields price and double were lost during a failed post. 2018-04-23 22:56:40 +02:00
Laurent Destailleur
0a5e606937 FIX extrafields price and double were lost during a failed post. 2018-04-23 22:53:57 +02:00
Laurent Destailleur
f95e5078c1 FIX Can't edit option PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY 2018-04-23 21:33:49 +02:00
Frédéric FRANCE
657fa48c3f
Update api_products.class.php 2018-04-23 15:31:55 +02:00
Laurent Destailleur
315d5bad39 FIX Error in ContractLigne not return to Contract 2018-04-23 15:07:50 +02:00
Laurent Destailleur
e834eff049 FIX #8650 2018-04-22 20:03:24 +02:00
Laurent Destailleur
6b90558b7a FIX File name not visible in email preview 2018-04-20 11:20:56 +02:00
Laurent Destailleur
7a703e149f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-20 01:39:48 +02:00
Laurent Destailleur
c6a53ca25d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/supplier_proposal/card.php
 2018-04-20 01:39:26 +02:00
Laurent Destailleur
54154343b2
Merge pull request #8643 from ATM-Marc/FIX_7.0_commonobject_default 
FIX: CommonObject: don't require 'notnull' field if 'default' set
 2018-04-20 01:28:00 +02:00
Laurent Destailleur
15aeffee7d
Merge pull request #8638 from ATM-Marc/FIX_showOutputField_empty_date 
FIX: don't print empty date in CommonObject::showOutputField
 2018-04-20 01:20:45 +02:00
Laurent Destailleur
b1ea34f4e7 FIX DOL_AUTOSET_COOKIE was not correctly setting value of cookie 2018-04-19 13:54:43 +02:00
Marc de Lima Lucio
893ce55852 FIX: commonobject: don't require notnull field if default set 2018-04-19 10:29:48 +02:00
florian HENRY
882863ab48 fix : define in conf dir_output for suipplier_proposal modules 2018-04-18 16:21:20 +02:00
florian HENRY
bf27ca1b11 fix : use template at the goos place for generate doc for supplier 
propoal
 2018-04-18 16:00:37 +02:00
Laurent Destailleur
1dc466e1fb FIX CVE-2018-10095 2018-04-18 12:32:19 +02:00
Laurent Destailleur
7ade4e37f2 FIX CVE-2018-10094 2018-04-18 12:23:49 +02:00
Laurent Destailleur
6b3e5e2085 FIX sanitize setup params 2018-04-18 12:19:23 +02:00
Laurent Destailleur
5d121b2d3a FIX CVE-2018-10092 2018-04-18 11:58:36 +02:00
Laurent Destailleur
fb3cae9ad3 Fix translation of country for GB 2018-04-18 11:36:44 +02:00
Marc de Lima Lucio
e88830820a FIX: dont print empty date in CommonObject::showOutputField 2018-04-18 11:13:18 +02:00
Laurent Destailleur
b39755f7b9 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-18 00:16:14 +02:00
Laurent Destailleur
013f95f54b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-18 00:02:51 +02:00
Laurent Destailleur
e4635c9401 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-18 00:01:40 +02:00
Laurent Destailleur
c7789d2038 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-18 00:01:06 +02:00
Laurent Destailleur
11897976c3
Merge pull request #8625 from hregis/6.0_multicompany 
Fix: missing drop index with postgresql
 2018-04-17 18:52:45 +02:00
Regis Houssin
9a210c1a91 Fix: syntax error for postgresql > 9.1 2018-04-17 17:33:40 +02:00
Regis Houssin
d89086cb7a Fix: missing drop constraint with postgresql 2018-04-17 17:25:54 +02:00
Regis Houssin
dd835c4868 Fix: missing drop index with postgresql 2018-04-17 17:18:59 +02:00
Laurent Destailleur
e7281238a9 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-17 16:17:25 +02:00
Laurent Destailleur
eb3b351e83 Transifex sync 2018-04-17 16:17:07 +02:00
Juanjo Menent
9ae28d2bc2 Fix: zip not filter 2018-04-17 10:43:25 +02:00
Laurent Destailleur
27a8476117 FIX remove var_dump 2018-04-16 17:02:54 +02:00
Laurent Destailleur
622042e9b2 FIX Max nb of generation of recurring invoice should not show warning 2018-04-16 15:05:35 +02:00
Laurent Destailleur
50d86a7cfd Fix accounting area when advanced accounting module not enabled 2018-04-16 14:25:39 +02:00
Laurent Destailleur
f1ad3912e7 Fix multicompany compatibility for recurring invoice generation 2018-04-16 14:18:38 +02:00
Laurent Destailleur
14ed19265c FIX environment shown on cron card 2018-04-16 13:53:59 +02:00
Laurent Destailleur
0d26bdcdc5 FIX Button receive products not visible 2018-04-16 11:20:29 +02:00
atm-greg
90f1ab8af4 add hooks on supplier documents 2018-04-16 06:46:22 +02:00
Laurent Destailleur
57c03553dd Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2018-04-15 12:09:07 +02:00
Laurent Destailleur
64dafbc37f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-15 11:33:40 +02:00
Laurent Destailleur
37e4da30d0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-15 11:33:27 +02:00
Juanjo Menent
bfed1b9db1 FIX: some localtaxes errors 2018-04-14 12:45:40 +02:00
Regis Houssin
79c34f4d69 Fix: project category is type 6 not 5 !! 2018-04-14 10:03:21 +02:00
Laurent Destailleur
6a3c2f9808 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/fourn/facture/card.php
 2018-04-13 23:27:14 +02:00
Laurent Destailleur
50a3b73a6f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-13 23:21:29 +02:00
Laurent Destailleur
3ec295935c Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-13 23:21:18 +02:00
Laurent Destailleur
c4076fc8bd Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-13 23:08:34 +02:00
Laurent Destailleur
8cfcdabcac Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2018-04-13 23:03:46 +02:00
Regis Houssin
556a418132 Fix: best method 2018-04-13 19:30:11 +02:00
Regis Houssin
199bf4c044 Fix: avoid focus problem when select2 is in a modal dialog window 2018-04-13 17:10:07 +02:00
atm-greg
4fae1e3236 rank of invoice_supplier lines was always -1 2018-04-13 17:01:10 +02:00
atm-greg
8d4126274a rang was missing on order_supplier lines 2018-04-13 15:53:49 +02:00
atm-greg
ef2c6a0ed4 fix sql error 2018-04-13 10:31:36 +02:00
atm-greg
58535993c1 use special_code on order_supplier lines 2018-04-13 10:31:27 +02:00
Laurent Destailleur
04aafbc493 Fix css to restore focus undertext on select2 combo lists 2018-04-13 10:01:07 +02:00
Laurent Destailleur
891925874f FIX #8574 2018-04-13 00:54:08 +02:00
Laurent Destailleur
ecd18da137 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-13 00:43:37 +02:00
Laurent Destailleur
f7bb781b42 FIX #8571 2018-04-13 00:43:15 +02:00
Laurent Destailleur
2bbde44f63 FIX #8580 2018-04-12 23:54:53 +02:00
Laurent Destailleur
421a794942 FIX #8559 Bug to generate cheque receipt 2018-04-12 17:22:51 +02:00
florian HENRY
cd2f6616be fix index creation with unique name for pgSQL 2018-04-12 16:41:53 +02:00
florian HENRY
def28be0ab fix error on first install pgsql 2018-04-12 16:36:04 +02:00
Laurent Destailleur
e437989853 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-12 13:25:27 +02:00
Laurent Destailleur
eec99b436e
Merge pull request #8565 from atm-greg/Add_supplierContactName_on_documents 
Add supplier contact name on supplier documents
 2018-04-11 19:25:01 +02:00
Laurent Destailleur
3df873ee06
Merge pull request #8562 from ATM-Marc/FIX_modulebuilder 
FIX: various modulebuilder-related issues
 2018-04-11 18:01:04 +02:00
Laurent Destailleur
9ccba03a17
Update html.form.class.php 2018-04-11 18:00:34 +02:00
Laurent Destailleur
885c2389af Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-11 17:58:37 +02:00
Laurent Destailleur
afdd504e16 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/accountancy/journal/sellsjournal.php
 2018-04-11 17:58:21 +02:00
Laurent Destailleur
0f3d2cc8df
Merge pull request #8564 from atm-ph/fix_6.0_sellsjournal_situation_invoice 
Fix wrong amount for situation invoice in sellsjournal
 2018-04-11 17:51:00 +02:00
atm-greg
ae34fa6fbd add supplier contact name on supplier documents 2018-04-11 17:42:26 +02:00
Laurent Destailleur
d7da83ebc5
Merge pull request #8560 from atm-john/Fix_extrafield_list_from_table_entity 
Fix extrafield entity query filter
 2018-04-11 17:31:36 +02:00
Laurent Destailleur
9a83a6ad6e
Merge pull request #8546 from atm-quentin/FIX_Issue_8455 
FIX Issue #8455
 2018-04-11 17:26:13 +02:00
Laurent Destailleur
e4f2e0ecbd Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-11 17:21:14 +02:00
Laurent Destailleur
590bc2948a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
 2018-04-11 17:20:49 +02:00
Laurent Destailleur
9fafefa0d7 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-11 17:18:09 +02:00
Laurent Destailleur
0518218aed Fix regression 2018-04-11 17:17:03 +02:00
atm-ph
6f526eb780 Fix wrong amount for situation invoice in sellsjournal 2018-04-11 16:40:59 +02:00
Laurent Destailleur
73a8966659
Merge pull request #8538 from atm-arnaud/FIX_8389_html_in_lang_DE 
FIX #8389
 2018-04-11 16:31:36 +02:00
Laurent Destailleur
307f217d56
Merge pull request #8543 from ATM-Nicolas/fix_duplicate_events 
FIX : multiple creation of same event
 2018-04-11 16:28:32 +02:00
Laurent Destailleur
23dba46c8c
Merge pull request #8551 from ATM-Nicolas/fix_datetime_extrafields 
FIX : update wrong datetime extrafield
 2018-04-11 16:28:04 +02:00
Laurent Destailleur
ca6b7205ef
Update commonobject.class.php 2018-04-11 16:27:56 +02:00
Laurent Destailleur
b732844e91
Merge pull request #8537 from atm-arnaud/FIX_8023_missing_escape_htmltag 
FIX #8023
 2018-04-11 16:25:33 +02:00
Laurent Destailleur
628b437e28
Update card.php 2018-04-11 16:25:05 +02:00
Laurent Destailleur
c392b9b8ef
Merge pull request #8541 from atm-gauthier/FIX_count_6.0 
FIX #8478 !empty instead of count to avoid warning
 2018-04-11 14:55:41 +02:00
Laurent Destailleur
75bc3d17e6
Update admin_extrafields_view.tpl.php 2018-04-11 14:55:29 +02:00
Laurent Destailleur
bc1515cb56
Merge pull request #8535 from atm-greg/Fix_dolGetFirstLastname 
fix #8521
 2018-04-11 14:54:15 +02:00
Laurent Destailleur
1f21078e08
Merge pull request #8536 from atm-florian/7.0_fix8474 
fix #8474
 2018-04-11 14:53:26 +02:00
Laurent Destailleur
ab43d9d675
Merge pull request #8544 from ATM-Marc/FIX_odt_cond_reglement 
FIX: payment term doc-specific label was not used (issue #8414)
 2018-04-11 14:52:06 +02:00
Laurent Destailleur
0d15d8e0ad Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/user/card.php
 2018-04-11 14:45:11 +02:00
Laurent Destailleur
804703c9c9 Fix regression 2018-04-11 14:43:16 +02:00
Laurent Destailleur
e1c83df086 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-11 14:39:13 +02:00
Laurent Destailleur
560038fa18 Fix regression in update contact 2018-04-11 14:38:56 +02:00
Laurent Destailleur
c2eb2bf10e
Merge pull request #8542 from ATM-Marc/FIX_user_autocomplete 
FIX: weird password autocompletion in Google Chrome (issue #8479)
 2018-04-11 13:22:42 +02:00
Laurent Destailleur
4f7fbb80ba Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-11 13:21:36 +02:00
Laurent Destailleur
21c65f812a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-11 13:21:20 +02:00
Laurent Destailleur
edb59c05dc
Merge pull request #8525 from atm-greg/Add_projettaskcard_hook 
add doActions hook on projettaskcard
 2018-04-11 13:20:07 +02:00
Laurent Destailleur
73aa34dfbe
Merge pull request #8528 from hregis/7.0_bug6 
FIX avoid Error: Call to undefined method mysqli::get_charset()
 2018-04-11 13:19:33 +02:00
Laurent Destailleur
ba526dd7f2
Merge pull request #8530 from hregis/7.0_bug3 
FIX missing User object with API REST
 2018-04-11 13:11:27 +02:00
Laurent Destailleur
e642535389
Merge pull request #8561 from frederic34/patch-11 
Update combinations.php
 2018-04-11 13:09:34 +02:00
Laurent Destailleur
6731e238a3
Merge pull request #8550 from atm-quentin/FIX_Issue_8037 
FIX issue #8037
 2018-04-11 13:06:26 +02:00
Laurent Destailleur
7d7c0624d2
Update traduction.php 2018-04-11 12:59:24 +02:00
Laurent Destailleur
50dd75632c
Merge pull request #8532 from atm-arnaud/FIX_8359_project_link_categ_list 
FIX #8359
 2018-04-11 12:57:41 +02:00
Laurent Destailleur
d02405dccd
Merge pull request #8533 from atm-quentin/FIX_issues_8470 
FIX issue #8470
 2018-04-11 12:52:44 +02:00
Marc de Lima Lucio
fa8cf98249 FIX: modulebuilder: handle 'price' fieldtype 2018-04-11 12:18:54 +02:00
Frédéric FRANCE
a95bc76afb
Update combinations.php 2018-04-11 12:10:58 +02:00
Frédéric FRANCE
bc7623d383
Update getCombinations.php 2018-04-11 12:05:23 +02:00
Marc de Lima Lucio
bbc12cf06b FIX: default addupdatedelete actions: uniformize add/update value checks 2018-04-11 11:49:29 +02:00
Marc de Lima Lucio
2f75bfcd83 FIX: modulebuilder: could not create html fields 2018-04-11 11:46:47 +02:00
Frédéric FRANCE
2c76a6cd80
Update combinations.php 2018-04-11 11:44:22 +02:00
Marc de Lima Lucio
c966cdbd47 FIX: selectForFormsList: entity checked even is object not multi-entity managed 2018-04-11 11:43:51 +02:00
John
96e26100f0 Add extrafield entity query filter 2018-04-11 11:27:47 +02:00
atm-greg
7cdc1c8bef Fix #8259 can't update contact birthday with REST API 2018-04-11 07:08:40 +02:00
ATM-Nicolas
cffe1e9771 FIX : Multiple creation of same event 2018-04-10 17:11:18 +02:00
ATM-Nicolas
47d5b1f6fd FIX : update wrong datetime extrafield 2018-04-10 16:39:28 +02:00
atm-quentin
809b2a91ed FIX issue #8037 2018-04-10 16:27:18 +02:00
atm-quentin
cc832bd972 FIX Issue #8455 2018-04-10 15:47:06 +02:00
Marc de Lima Lucio
1fd5dba118 FIX: payment term doc-specific label was not used 2018-04-10 15:24:57 +02:00
Marc de Lima Lucio
307ede8b22 FIX: weird password autocompletion in Goocle Chrome (issue #8479) 2018-04-10 15:03:50 +02:00
gauthier
5621d1f8ea FIX #8478 !empty instead of count to avoid warning 2018-04-10 15:03:15 +02:00
atm-arnaud
26e9f10833 FIX #8389 2018-04-10 14:52:16 +02:00
atm-arnaud
848d76ee78 FIX #8023 2018-04-10 14:43:32 +02:00
florian HENRY
84f80795c3 fix #8474 2018-04-10 14:38:41 +02:00
atm-greg
4f13a4f45b fix #8521 2018-04-10 14:16:01 +02:00
Maxime Kohlhaas
cb1a011b50 Fix default currency not set on supplier order creation from commercial menu #8459 2018-04-10 14:14:16 +02:00
atm-arnaud
d24b36f768 FIX #8359 2018-04-10 14:10:40 +02:00
atm-quentin
6277928b67 FIX issue #8470 2018-04-10 14:01:35 +02:00
Regis Houssin
97bf6fff7f Fix: missing User object with API REST 2018-04-10 08:07:23 +02:00
Regis Houssin
89ec185f51 Fix: avoid Error: Call to undefined method mysqli::get_charset() 2018-04-09 12:53:03 +02:00
Regis Houssin
976b5c26c7 Fix: TODO get_charset() function don't exists 2018-04-09 12:26:39 +02:00
atm-greg
b1469ba761 add doActions hook on projettaskcard 2018-04-09 07:06:20 +02:00
Laurent Destailleur
79af10fc83 Fix search filters 2018-04-08 13:01:42 +02:00
Laurent Destailleur
3d36e3ee49 Fix search criteria in bookkeeping table 2018-04-08 12:41:03 +02:00
Laurent Destailleur
560c84be0d FIX When clearing filter, we must not save tmp criterias in session 2018-04-08 12:40:19 +02:00
Laurent Destailleur
8cca3dabd6 FIX look and feel v7 "back to" for bookkeeping record 2018-04-08 11:29:30 +02:00
Laurent Destailleur
aad99bdcc0 FIX Removed error when no error on accounting setup page 2018-04-07 22:27:42 +02:00
Laurent Destailleur
304adff973 FIX view of balance before field 
Conflicts:
	htdocs/compta/bank/bankentries_list.php
 2018-04-07 21:49:59 +02:00
Laurent Destailleur
989d1c87c6 Fix link to reconcile 2018-04-07 20:06:19 +02:00
Laurent Destailleur
bacee3c298 Translation 2018-04-07 20:06:14 +02:00
Laurent Destailleur
5a34a22934 Code comment 2018-04-07 13:04:52 +02:00
Laurent Destailleur
15c7bbf9d8 Fix input lost when error 2018-04-07 12:28:10 +02:00
Laurent Destailleur
ebb418fe3a Fix CSRF test 2018-04-06 20:06:05 +02:00
Laurent Destailleur
35d2f0e441 Fix no lose entry when error on survey comment submission 2018-04-06 19:42:59 +02:00
Laurent Destailleur
84426c69e3 Fix not not saved 2018-04-06 19:26:24 +02:00
Laurent Destailleur
77f2b137b5 FIX XSS 2018-04-06 19:23:41 +02:00
Laurent Destailleur
1a321e19c8 FIX XSS in company setup page 2018-04-06 19:12:13 +02:00
Laurent Destailleur
417c07a6e8 Fix REFLECTED XSS 2018-04-06 18:33:51 +02:00
Laurent Destailleur
2d1183cbb7 FIX can bypass the CSRF protection with url with domain inside 2018-04-06 17:58:30 +02:00
Laurent Destailleur
1623fea618 FIX SQL Injection CWE-89 2018-04-06 17:25:22 +02:00
Laurent Destailleur
1009a629d9 Try better Fix for #8432 2018-04-06 13:20:09 +02:00
François J
a78c064461 Fix CommandeFournisseur::getDispachedLines line ID & return quantity 2018-04-06 11:22:15 +02:00
Laurent Destailleur
723ac6fba0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-06 00:02:06 +02:00
Laurent Destailleur
920891ba70 Fix edit of default opportunit percent 2018-04-06 00:01:24 +02:00
Laurent Destailleur
2207e5e470 Fix tooltip 2018-04-05 19:23:36 +02:00
TuxGasy
47dcc0d5c6 fix notrigger ignored on BILL_CREATE 2018-04-05 18:32:41 +02:00
Laurent Destailleur
8cf56a5b9c Fix regression 2018-04-05 16:29:37 +02:00
Laurent Destailleur
dfa37be7e9
Merge pull request #8499 from atm-maxime/7.0 
FIX service creation, right is tested regarding the product type
 2018-04-05 16:21:06 +02:00
Laurent Destailleur
55719cd166
Update card.php 2018-04-05 16:20:50 +02:00
Laurent Destailleur
ab27b105c0
Merge pull request #8490 from hregis/7.0_bug6 
FIX limit access of email template page to internal users
 2018-04-05 16:11:04 +02:00
Laurent Destailleur
45d074c39d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-05 13:25:59 +02:00
Laurent Destailleur
2b135dc951 FIX #8488 2018-04-05 13:13:45 +02:00
Laurent Destailleur
08ab67289b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/societe/class/societe.class.php
 2018-04-05 13:10:11 +02:00
Regis Houssin
5914bfdf18 Fix: more complete 2018-04-05 13:00:55 +02:00
Regis Houssin
156d26ddb9 Fix: backward compatibility 2018-04-05 13:00:50 +02:00
Laurent Destailleur
0223d54107 FIX Support or multicompany for sheduled jobs 
FIX Use priority to define order of sheduled jobs

Conflicts:
	htdocs/cron/list.php
 2018-04-05 12:38:42 +02:00
Laurent Destailleur
88b3e08b22 FIX filter/sorting on extrafield on contact list from contact tab 2018-04-05 11:34:26 +02:00
Laurent Destailleur
7c70f9ed03 Fix option STOCK_SUPPORTS_SERVICES 2018-04-03 20:23:47 +02:00
Maxime Kohlhaas
0c3b92f09a Better fix 2018-04-03 14:53:57 +02:00
Maxime Kohlhaas
39eab6d88d Fix service creation, right is tested regarding the product type 2018-04-03 14:38:20 +02:00
Laurent Destailleur
8595d7621b Fix POST mut use method POST no GET 2018-04-02 23:30:23 +02:00
Laurent Destailleur
fba40575f7 Remove dead code 2018-04-02 16:39:48 +02:00
Regis Houssin
c720345e6d Fix: better test 2018-04-01 11:47:10 +02:00
Regis Houssin
20e80a58a8 Fix: limit access to internal users 2018-04-01 11:43:39 +02:00
Laurent Destailleur
84bb4c6ad7 FIX With x extrafields, request for multicompany label was done x times 2018-03-30 19:51:53 +02:00
Laurent Destailleur
2e22c13062 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-29 15:31:35 +02:00
Laurent Destailleur
fdfcb96176 Fix length of combobox 2018-03-29 15:31:21 +02:00
Laurent Destailleur
0e986b8f97
Update societe.class.php 2018-03-29 13:48:09 +02:00
Laurent Destailleur
839ebb428b
Merge pull request #8477 from ggg44473/7.0 
Fix wrong approve time in expense report
 2018-03-29 13:40:33 +02:00
Laurent Destailleur
92cbcd9ccb
Merge pull request #8462 from atm-florian/7.0 
Fix error log
 2018-03-29 13:38:35 +02:00
Laurent Destailleur
188e5d286d Fix statut 2018-03-29 13:28:29 +02:00
Laurent Destailleur
072b6c02c0 FIX Test on mandatory status when closing proposal failed 2018-03-29 13:25:03 +02:00
Laurent Destailleur
b806b85761 Fix field filtert is set twice 2018-03-29 11:15:50 +02:00
florian HENRY
cc7deb0add Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0 2018-03-29 09:36:05 +02:00
florian HENRY
78812ef826 better error management 2018-03-29 09:35:47 +02:00
Sean Wang
3dd9d47089 Fix wrong approve time in expense report 
The approve time showed was 8 hours more than the real time.
Checking database turned out that it had the wrong data(+8 hours).

After checking every timezone related settings were correct,
I found that it do twice idate() in setApproved().
Since we have idate() in $sql, we don't need the idate()
at the line 1249.
 2018-03-29 14:49:06 +08:00
Laurent Destailleur
125085acee Fix name of method to avoid ci errors 2018-03-29 03:01:05 +02:00
atm-ph
a89983ef5c Fix error on creating company with external module in 'custom' folder with a file to generate accountancy code 2018-03-28 15:41:10 +02:00
florian HENRY
7635f23d78 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0 2018-03-27 18:39:56 +02:00
florian HENRY
af7c1d8da1 fix error log 2018-03-27 18:39:18 +02:00
Frédéric FRANCE
299c32d262 Update actions_sendmails.inc.php 2018-03-27 18:02:27 +02:00
Laurent Destailleur
34fae0bd48
Merge pull request #8456 from atm-greg/Fix_bankentries_list 
FIX sql error using no category
 2018-03-27 17:49:01 +02:00
Bruno Généré
925e0c46dd BUG - Point of sale - buttons for cheque and CB are not displayed properly when one account is not defined 
I find out in the point of sale module that when you have an account for CB but not for check than you could use check but not CB.
It seems quite obvious when you look to the previous code that a mistake was done.
This is now fixed I expect.
The workaround for now is to define both default accounts (for check and for CB).
 2018-03-27 17:13:25 +02:00
Laurent Destailleur
460344fbfb Traduction 2018-03-27 16:02:06 +02:00
Laurent Destailleur
51cd793d80 Fix log and duplicate vat_by_date function 2018-03-27 14:37:29 +02:00
Laurent Destailleur
f9ee2930e2 FIX Data on income/expense report was always 0 2018-03-27 14:16:59 +02:00
Laurent Destailleur
0b13cd17ac FIX Some report have data when several chart of accounts exists 
FIX Detail per account not visible when total < 0
 2018-03-27 13:55:10 +02:00
Laurent Destailleur
2b588b9e43 FIX Initial month on report income/expense per predefined group 2018-03-27 13:37:40 +02:00
Laurent Destailleur
930512d9a2 FIX Add a test to avoid to reset binding by error. 2018-03-27 13:08:16 +02:00
Laurent Destailleur
56944115cb Hide a very dangerous feature. Should be useless. 2018-03-27 12:46:15 +02:00
Laurent Destailleur
dab8dbd671 FIX Binding pages must start on fiscal month not calendar month 2018-03-27 12:31:08 +02:00
Laurent Destailleur
88939a8469 FIX Draft invoice must be excluded from report 2018-03-27 11:10:12 +02:00
atm-greg
91d6a1b621 fix sql error using no category 2018-03-27 06:40:12 +02:00
Laurent Destailleur
89bf781fe6 FIX Add warning when expense report line not into range 
FIX Name of user not visible on journalizing expense report payments
FIX Only approved expense report must be journalized
 2018-03-26 14:13:40 +02:00
Laurent Destailleur
934d2d8881 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/filefunc.inc.php
 2018-03-25 15:27:31 +02:00
Laurent Destailleur
c85cb7fe0a
Merge pull request #8447 from fappels/7.0_modulbuilder 
Update on module builder
 2018-03-24 16:41:43 +01:00
Laurent Destailleur
d63c8356f4
Merge pull request #8437 from hregis/7.0_bug6 
Fix: uniformize getEntity('intervention')
 2018-03-24 16:36:27 +01:00
Laurent Destailleur
224fa1c03e Fix external links ko when substitution key are inside domain 2018-03-24 12:48:33 +01:00
Laurent Destailleur
a3c199e9e3 FIX Missing include 2018-03-24 12:48:19 +01:00
fappels
caa43ae2f6 Make helper methods available for derived classes. 
Use-case: a module build with modulebuilder can make it's own fetch
method using the helper methods.
 2018-03-23 17:35:46 +01:00
Laurent Destailleur
83b6dd4cb9 Prepare 7.0.2 2018-03-23 16:17:56 +01:00
Laurent Destailleur
a15abb2ded Update lang 2018-03-23 16:17:28 +01:00
Laurent Destailleur
c12469860a Update lang 2018-03-23 16:17:10 +01:00
florian HENRY
11446fb2f7 Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0 2018-03-22 23:26:37 +01:00
florian HENRY
46d2b4d62d fix security check on fourn card 2018-03-22 23:25:54 +01:00
Laurent Destailleur
9f67bb0aa3 Start 6.0.7 2018-03-22 21:58:24 +01:00
Regis Houssin
9cf66e53f6 Fix: wrong module name 2018-03-22 16:39:47 +01:00
Regis Houssin
b5f37301a5 Fix: uniformize getEntity('intervention') 2018-03-22 16:28:00 +01:00
Laurent Destailleur
87815265c8 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-22 14:19:56 +01:00
Laurent Destailleur
a9944e1d23 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	ChangeLog
	htdocs/contrat/card.php
 2018-03-22 14:19:34 +01:00
Laurent Destailleur
ed2d9f179b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/contrat/card.php
 2018-03-22 14:12:37 +01:00
Laurent Destailleur
99d88b0fa9
Merge pull request #8435 from enstentechnologies/7.0 
FIX PropalStatusValidatedShort missing in langs/en_US/propal.lang
 2018-03-22 14:04:40 +01:00
Laurent Destailleur
0bb7d4d494
Update propal.lang 2018-03-22 14:04:33 +01:00
Laurent Destailleur
a7cb811b39
Merge pull request #8431 from fappels/7.0_fix_products_translation 
Fix products translation
 2018-03-22 13:51:37 +01:00
vabeltran
3793fd69e6 FIX PropalStatusValidatedShort missing in langs/en_US/propal.lang 
Added PropalStatusValidatedShort value, missing in lang/en_US/propal.lang file.
 2018-03-22 13:18:06 +01:00
Laurent Destailleur
658b145ff4 Missing translation 2018-03-22 13:16:38 +01:00
Laurent Destailleur
68a4058387 Fix translation 2018-03-22 13:03:12 +01:00
fappels
3765bc4775 Fix html escape for edit label 2018-03-22 10:48:03 +01:00
fappels
9e4a66b1a9 Fix hidden oprion PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION 2018-03-22 10:46:54 +01:00
Laurent Destailleur
227b830aa2 Fix visible rounding of abandonned amount 2018-03-22 09:41:30 +01:00
florian HENRY
1feb22ea9c fix user right on modRessource 2018-03-21 22:24:11 +01:00
Laurent Destailleur
b3bb6d88e6 Fix list of leave not complete for a manager 2018-03-21 19:17:42 +01:00
atm-ph
2094c48b7f Fix missing folder with multientity 2018-03-21 12:14:04 +01:00
atm-ph
cad7bdc74b Fix documents are lost if we rename contrat ref 2018-03-21 11:54:25 +01:00
Laurent Destailleur
a2b9dbfbe3 Fix list must show only employee 2018-03-21 11:13:28 +01:00
Laurent Destailleur
891ebc0e7c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-21 10:59:59 +01:00
Laurent Destailleur
04199c2b4b Fix according to mail of Olivier Geffroy the 21th of march 2018-03-21 10:59:13 +01:00
Laurent Destailleur
ac35acb273 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-20 20:04:20 +01:00
Laurent Destailleur
fe53ff56ee FIX Error management in leave request 2018-03-20 20:03:44 +01:00
Laurent Destailleur
11d33c8dcc
Merge pull request #8420 from hregis/7.0_bug3 
Fix: better compatibility with all hostname syntax
 2018-03-20 17:32:14 +01:00
Laurent Destailleur
a3a416aa7a Can remove comment added due to lack of test 2018-03-20 16:46:09 +01:00
Laurent Destailleur
78b4492f1e FIX Permission in list of holiday 
Conflicts:
	htdocs/holiday/list.php
 2018-03-20 14:46:46 +01:00
Laurent Destailleur
8214e7bb42 Fix missing security restiction test 2018-03-20 14:32:24 +01:00
Laurent Destailleur
896a1cbc24 Fix bad var init 2018-03-20 11:27:47 +01:00
Laurent Destailleur
8cf2d4eb45 Fix filter on holiday statut 
Fix tr/td balance for extrafields on lines
 2018-03-20 10:10:21 +01:00
Laurent Destailleur
a325bbf865 FIX Input of holiday for subordinates was ko 2018-03-19 20:46:43 +01:00
Laurent Destailleur
0dc8d3cb00 Fix trad 2018-03-19 18:53:33 +01:00
Regis Houssin
4767819b7a Fix: better compatibility with all hostname syntax 2018-03-19 17:59:23 +01:00
Laurent Destailleur
14e80948b8 FIX approval date was not visible if leave was canceled after 2018-03-19 17:53:33 +01:00
Laurent Destailleur
ee3dcb724f FIX email use the validate user instead of approver in holiday approval 
email.
 2018-03-19 17:20:44 +01:00
Laurent Destailleur
73eba91756 Fix translation of email message 2018-03-19 17:06:59 +01:00
Laurent Destailleur
91cc3d1b73 FIX navigation and filters on holiday list 2018-03-19 16:11:42 +01:00
Laurent Destailleur
e0164884ee Better management of hidden option HOLIDAY_HIDE_BALANCE 2018-03-19 15:13:36 +01:00
Laurent Destailleur
eb03fb7540 Fix trad/compatibility 2018-03-19 15:00:50 +01:00
Laurent Destailleur
ac9ab7b228 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-19 14:10:17 +01:00
Laurent Destailleur
8889e7f4b2 FIX translation of holiday types 2018-03-19 14:09:44 +01:00
Laurent Destailleur
eb7886ecff
Update ldap.class.php 2018-03-19 12:37:53 +01:00
Regis Houssin
890d0b6685 Fix: replace ldaps:// by ssl:// 2018-03-19 12:11:59 +01:00
Laurent Destailleur
0013e9d83b FIX Make a redirect after the remove_file action to avoid deletion done 
at next action too.
 2018-03-19 11:29:36 +01:00
Laurent Destailleur
8e72ddc89b FIX missing email of customer in stripe info payments 2018-03-19 10:18:03 +01:00
Laurent Destailleur
8e50e63243 Fix translation 2018-03-18 20:32:18 +01:00
Laurent Destailleur
e55c90b015 Fix translation 2018-03-18 20:29:36 +01:00
Laurent Destailleur
99ac06b0b8 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-18 20:22:22 +01:00
Laurent Destailleur
b4881645d8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2018-03-18 20:21:59 +01:00
Laurent Destailleur
0dd33440d1
Merge pull request #8397 from hregis/7.0_bug3 
Fix: missing update of $conf
 2018-03-18 12:29:58 +01:00
Regis Houssin
c0a6ae2195 Fix: replace with dolibarr_install_syslog 2018-03-16 18:31:11 +01:00
Laurent Destailleur
bbb095bcb2 FIX css 2018-03-16 12:19:16 +01:00
Laurent Destailleur
07fb29f0c4 Fix var not initialized 2018-03-16 12:18:20 +01:00
Laurent Destailleur
46e8692620 Escape db 2018-03-16 12:17:20 +01:00
Laurent Destailleur
ff765a2efe FIX Look and feel v7 2018-03-16 12:16:40 +01:00
Laurent Destailleur
96ff5b1b23 Update sql image file for 7.0 stable 2018-03-16 11:19:58 +01:00
arnaud
32ce42610a FIX show status on societe banner 2018-03-16 11:18:00 +01:00
Laurent Destailleur
fe94562a56 Prepare 7.0.1 2018-03-16 01:33:11 +01:00
Laurent Destailleur
a94017ba25 FIX letter for month March 2018-03-16 00:07:00 +01:00
Laurent Destailleur
ce7da41bef Fix save setup 2018-03-15 23:47:16 +01:00
Regis Houssin
6e585869c7 Fix: better method for avoid lost global 2018-03-15 19:33:08 +01:00
Regis Houssin
9f62ddaf36 Fix: missing update of $conf 2018-03-15 19:24:34 +01:00
Laurent Destailleur
ce0144e645 Add code to help debug 2018-03-15 13:21:02 +01:00
Laurent Destailleur
542eb2e5f4 Comment 2018-03-15 13:19:29 +01:00
Laurent Destailleur
85e307d6b8 Fix report when group is not dedicated to a country 2018-03-15 12:31:24 +01:00
Laurent Destailleur
73005d81a7 FIX country must not be mandatory for accounting report groups 2018-03-15 11:42:59 +01:00
Laurent Destailleur
97c8504915 Fix remove log 2018-03-15 10:26:06 +01:00
Laurent Destailleur
c4eea1f0e0 Fix SQLi 2018-03-15 02:12:01 +01:00
Laurent Destailleur
4957ea9178 Fix SQLi reported by op7ica 2018-03-15 01:55:16 +01:00
Laurent Destailleur
6a70d268e0 Fix SQLi reported by op7ica 2018-03-15 01:22:32 +01:00
Laurent Destailleur
14a33af603
Merge pull request #8384 from fmarcet/7.0 
FIX Activate all also if there are inactive services
 2018-03-15 00:37:37 +01:00
Laurent Destailleur
c69f5843da
Update card.php 2018-03-15 00:36:56 +01:00
Laurent Destailleur
ffc91bdfdf
Merge pull request #8383 from ggg44473/7.0 
Add missing $mode in BookKeeping::createStd()
 2018-03-15 00:33:37 +01:00
fmarcet
5140c1c5d2 Fix: Merge categories when merging thirds 2018-03-14 13:25:05 +01:00
ATM-Nicolas
e801b5a431 FIX : Delete tasks on project delete will now trigger TASK_DELETE 2018-03-14 11:38:42 +01:00
Ferran Marcet
4d4a204f7f Merge remote-tracking branch 'upstream/7.0' into 7.0 2018-03-14 11:11:54 +01:00
Ferran Marcet
e47dda72e7 Fix: Activate all also if there are inactive services 2018-03-14 11:08:38 +01:00
Laurent Destailleur
e7a315958d
Merge pull request #8381 from fmarcet/7.0 
FIX Can't activate tasks on projects configuration
 2018-03-14 10:42:45 +01:00
Ferran Marcet
304595ee4f Fix: Can't activate tasks on projects configuration 2018-03-14 09:48:39 +01:00
Sean Wang
9a1588df13 Add missing $mode in BookKeeping::createStd() 
In accountancy ledger, creating new transaction, there is
'ERROR: 55000: currval of sequence "llx_accounting_bookkeeping_rowid_seq"
is not yet defined in this session' occurred.

According to dolibarr.log, this error will show up after
createStd() {...Insert request to llx_accounting_bookkeeping_tmp...}.

It query the "llx_accounting_bookkeeping_rowid_seq" instead of
"llx_accounting_bookkeeping_tmp_rowid_seq",
due to missing $mode at bookkeeping.class.php
line504:last_insert_id().
 2018-03-14 16:38:22 +08:00
Laurent Destailleur
ca809a11af Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/commande/class/commande.class.php
 2018-03-13 18:04:18 +01:00
atm-quentin
af09a3714b FIX reverse field to have object loaded in doaction 2018-03-13 17:12:03 +01:00
Laurent Destailleur
f88536068f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-13 15:30:07 +01:00
Laurent Destailleur
17b7c6268e FIX avoid "Array" on screen 2018-03-13 15:29:52 +01:00
ptibogxiv
4f6f0b302e
FIX for nondisplay of fk_element 's id in REST API response 
the fk_element don't display when the call is made with REST API (reason non found)
 2018-03-13 10:28:44 +01:00
Laurent Destailleur
dcd3387a30
Update commande.class.php 2018-03-13 09:53:21 +01:00
Laurent Destailleur
51229a602f
Update commande.class.php 2018-03-13 09:51:45 +01:00
atm-quentin
6c7a5cebdf FIX check verif exped on delete order 2018-03-13 09:34:50 +01:00
Laurent Destailleur
ae5080dab4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-12 20:16:23 +01:00
Laurent Destailleur
d045dca003 Fix financial commitment 2018-03-12 20:04:25 +01:00
Laurent Destailleur
55d3e72463 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/contact/class/contact.class.php
	htdocs/societe/card.php
 2018-03-12 19:02:30 +01:00
TuxGasy
34145ed443 Do not display multicurrency cols if currency of object is same as main currency 2018-03-11 21:58:32 +01:00
Laurent Destailleur
51c94fadfa Look and feel v7 2018-03-11 21:31:34 +01:00
Laurent Destailleur
e1654f4215 Fix division by zero 2018-03-11 21:18:18 +01:00
Laurent Destailleur
95e7062ca3 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-03-11 19:29:01 +01:00
Laurent Destailleur
d5d6939fd9 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-03-11 19:28:39 +01:00
Laurent Destailleur
a3d25b24d3 FIX #8285 Extrafields now reported by /api/index.php/agendaevents/{id} 2018-03-11 19:27:03 +01:00
Laurent Destailleur
5c4b5cc74f fix 2018-03-11 00:40:35 +01:00
Laurent Destailleur
9ed2e47775 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-11 00:32:41 +01:00
Laurent Destailleur
897b3f7b79 Fix setup 2018-03-11 00:31:26 +01:00
Laurent Destailleur
f98ca2e31a
Merge pull request #8335 from inoveaconseil/patch-1 
Fix #8092
 2018-03-11 00:06:28 +01:00
Laurent Destailleur
03f7df88c6
Update card.php 2018-03-11 00:05:32 +01:00
Inovea Conseil
c2397fad60
Fix #8092 2018-03-10 23:49:43 +01:00
Maxime Kohlhaas
c008853842 Fix #8057 2018-03-10 23:05:33 +01:00
Laurent Destailleur
6c9e0e1752
Merge branch '7.0' into 7.0 2018-03-10 21:52:57 +01:00
Alexis Algoud
74dc815bfa fix commonobject isInt for module builder capabilities 2018-03-10 19:02:06 +01:00
Laurent Destailleur
905cf112e9
Merge pull request #8327 from tiaris/fix7.0 
FIX #8289
 2018-03-10 18:58:22 +01:00
Laurent Destailleur
6fcc271790
Update product.class.php 2018-03-10 18:57:55 +01:00
Laurent Destailleur
aea3c164ba
Merge pull request #8178 from hregis/7.0_bug2 
Fix: avoid Warning: A non-numeric value encountered
 2018-03-10 18:47:11 +01:00
Laurent Destailleur
3911738b88 Fix vulnerability reported by DIGITEMIS CYBERSECURITY & PRIVACY 2018-03-10 18:40:45 +01:00
Laurent Destailleur
e3ace1f89f Fix morecss not provided 2018-03-10 18:17:54 +01:00
Laurent Destailleur
702c84a100 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-10 17:57:49 +01:00
Laurent Destailleur
241b5e9a93 FIX security report DIGITEMIS CYBERSECURITY & PRIVACY 2018-03-10 15:52:11 +01:00
BadPixxel
44d18027f2 BugFix for PHP7.1: PHP Warning: A non-numeric value encountered in /tmp/Dolibarr/htdocs/product/class/product.class.php on line 1709 2018-03-10 15:48:40 +01:00
BadPixxel
836054a8b3 BugFix Issue #8261: Variants module. Combinations cannot be edited 2018-03-10 14:51:24 +01:00
jean
6793bfae3a FIX #8289 add a cofoiguration for correct stopck calculation 2018-03-10 14:17:52 +01:00
Laurent Destailleur
a85a103a55
Merge pull request #8308 from atm-florian/7.0_fixinventory 
7.0 fixinventory
 2018-03-10 12:54:36 +01:00
Laurent Destailleur
212536a3fd
Update list.php 2018-03-10 12:54:20 +01:00
Laurent Destailleur
64f2f324de
Update card.php 2018-03-10 12:52:09 +01:00
Laurent Destailleur
a7f82af352
Update card.php 2018-03-10 12:49:25 +01:00
Laurent Destailleur
75b470b580
Update eldy.lib.php 2018-03-10 12:43:01 +01:00
Laurent Destailleur
04bcc4dd46
Update eldy.lib.php 2018-03-10 12:39:39 +01:00
Maxime Kohlhaas
fd36ade61a Fix unit in replenish #7225 2018-03-10 11:20:32 +01:00
Maxime Kohlhaas
d92fa3a69c Fix required field + space in dispatch 2018-03-09 23:49:40 +01:00
florian HENRY
c62904d632 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_fixinventory 2018-03-09 23:41:32 +01:00
Laurent Destailleur
612b95b219
Merge pull request #8316 from atm-maxime/fix_clone_supplierorder 
Fix supplier order clone was keeping objectlinked
 2018-03-09 23:01:45 +01:00
Laurent Destailleur
31f36f4028
Merge pull request #8312 from atm-florian/7.0_fix8232 
7.0 fix8232
 2018-03-09 22:47:10 +01:00
Maxime Kohlhaas
d82c62b638 Fix supplier order clone was keeping objectlinked 2018-03-09 21:51:59 +01:00
TuxGasy
9eeb80151e Fix bug when updating multi currency rate on invoice supplier 2018-03-09 21:13:54 +01:00
Laurent Destailleur
143827ac79
Merge pull request #8306 from Robisix/7.0 
FIX Duplicate product_type asignement on order addline
 2018-03-09 19:45:47 +01:00
florian HENRY
42fed5981d bettre syntax 2018-03-09 19:16:06 +01:00
florian HENRY
02beed265e better space 2018-03-09 19:14:43 +01:00
florian HENRY
5a56e802d9 FIX #8232 2018-03-09 19:10:52 +01:00
florian HENRY
f0164f2689 fix type date 2018-03-09 14:25:37 +01:00
florian HENRY
1c966d4769 on going 2018-03-09 12:57:58 +01:00
Romain DELVAL
ee55776886 FIX Duplicate product_type asignement on order addline 
On addline order method, ther is a duplicate assignation on
line->product_type before call to "insert" method.
The second assignement always make product_type to "0" while it was
fetched from product himsel like it was made on first asignement few
lines above
 2018-03-09 12:38:28 +01:00
florian HENRY
f37d482331 fix warning and sql error 2018-03-09 11:37:23 +01:00
atm-ph
53ce297ab3 Fix travis - missing documentation of new param 2018-03-09 09:30:11 +01:00
Laurent Destailleur
ad96229ec4 Fix not visible template selector for supplier order/invoice emails 
Conflicts:
	htdocs/fourn/facture/card.php
 2018-03-08 20:52:25 +01:00
Laurent Destailleur
af9fff4f83 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-08 16:35:12 +01:00
Laurent Destailleur
3762ed12c7 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2018-03-08 16:33:51 +01:00
Laurent Destailleur
343ca1bc77
Merge pull request #8294 from hregis/7.0_bug5 
Fix: avoid conflict between invoice and invoicenumber sharings
 2018-03-08 16:24:05 +01:00
Laurent Destailleur
7a7c4b8f14 Fix invalid url 2018-03-08 14:41:13 +01:00
Laurent Destailleur
d8dcebfa9a FIX Do not lose filter when editing comment of a time spent in task view 2018-03-07 20:12:40 +01:00
Laurent Destailleur
cab61724f2 Fix phpcs 2018-03-07 19:40:06 +01:00
Laurent Destailleur
317a5f5b2f Fix by adding a redirect to avoid the order2billing being done twice. 2018-03-07 19:15:23 +01:00
Laurent Destailleur
78259db0ee Intorduce dolDecodeBlockedData 2018-03-07 19:14:48 +01:00
Laurent Destailleur
69ef6a9316 Fix data on thirdparty tooltip 2018-03-07 19:13:54 +01:00
Laurent Destailleur
c02e8e9831 Css 2018-03-07 19:13:15 +01:00
Marc de Lima Lucio
884b74a6bb FIX: warning when adding ECM files using old photo path 2018-03-07 17:12:59 +01:00
Laurent Destailleur
acc29ea163 FIX #8219 2018-03-07 16:19:13 +01:00
Laurent Destailleur
f4f009d877 FIX #8269 2018-03-07 16:10:40 +01:00
Laurent Destailleur
eeb5b4b206 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-07 15:53:12 +01:00
Laurent Destailleur
b2f6105ae2 FIX #8277 2018-03-07 15:52:58 +01:00
Regis Houssin
a0774d523d Fix: avoid conflict between invoice and invoicenumber sharings 2018-03-07 15:24:23 +01:00
Laurent Destailleur
64e59c3f97
Merge pull request #8292 from hregis/7.0_bug6 
Fix: avoid error if type is not numeric
 2018-03-07 13:08:31 +01:00
Laurent Destailleur
f8d8c5c658 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-07 13:04:27 +01:00
Laurent Destailleur
004839b368 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-07 13:03:40 +01:00
Laurent Destailleur
8b9041b93e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-03-07 13:02:18 +01:00
Laurent Destailleur
4caefbe926 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2018-03-07 12:59:52 +01:00
Laurent Destailleur
e518303e1b
Merge pull request #8288 from atm-florian/7.0_fix_comment_task 
FIX comment on tasks
 2018-03-07 12:40:31 +01:00
Laurent Destailleur
f7f9f0e605
Update comment.php 2018-03-07 12:40:09 +01:00
Laurent Destailleur
ee1a2c49fd
Merge pull request #8287 from hregis/7.0_bug3 
Fix: problem to see users with transverse mode
 2018-03-07 12:38:00 +01:00
Regis Houssin
0f574579eb Fix: avoid error if type is not numeric 2018-03-07 12:27:13 +01:00
Laurent Destailleur
2053cc9307
Merge pull request #8284 from hregis/7.0_bug5 
Fix: wrong entity id, always value 1 !
 2018-03-07 12:19:09 +01:00
Marc de Lima Lucio
dd208348c4 FIX: add planned delivery to order exports 2018-03-07 12:18:08 +01:00
alexis Algoud
cb27eb98e1 FIX natural search double quote 2018-03-07 11:42:47 +01:00
Laurent Destailleur
a0a9e12178 Fix css 2018-03-07 11:29:50 +01:00
Laurent Destailleur
f3fd5f4cfa FIX Label of event show twice 2018-03-07 11:03:35 +01:00
florian HENRY
6cb77577a6 can use image 2018-03-07 09:03:13 +01:00
florian HENRY
bb73a715a8 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_fix_comment_task 2018-03-07 08:49:08 +01:00
florian HENRY
03873038d5 fix comment task 2018-03-07 08:47:34 +01:00
Laurent Destailleur
23a4a60970 Fix status of task 2018-03-06 21:51:43 +01:00
Laurent Destailleur
0dfc9af72a FIX multicompany compatibility and fix reports 2018-03-06 19:58:13 +01:00
Regis Houssin
bf4402eb89 Fix: missing superadmin 2018-03-06 19:22:59 +01:00
Regis Houssin
175971bfc1 Fix: syntax error 2018-03-06 19:12:18 +01:00
Regis Houssin
d406b28911 Fix: problem to see users with transverse mode 2018-03-06 19:08:39 +01:00
Regis Houssin
1807bb36e2 Fix: missing global $conf 2018-03-06 13:31:13 +01:00
Regis Houssin
35703cff99 Fix: wrong entity id, already value 1 ! 2018-03-06 13:23:00 +01:00
Laurent Destailleur
592a97f9a5 Fix default topic 2018-03-06 12:45:48 +01:00
Laurent Destailleur
45fd0cfc16 FIX Subscription events not recorded into agenda 2018-03-06 12:36:39 +01:00
Laurent Destailleur
72af963ed5 Fix triggers 2018-03-06 12:26:26 +01:00
Laurent Destailleur
1e6a55745c CSS 2018-03-06 11:54:05 +01:00
Laurent Destailleur
17e012e0ac FIX Subscription not correctly log in blockedlog 2018-03-06 09:08:45 +01:00
Laurent Destailleur
7c95233e3c FIX Trad and creation date in subscription create 2018-03-06 09:08:28 +01:00
Laurent Destailleur
14d7ffa53b Fix cancel and template to record stock movement/correction 2018-03-06 09:07:39 +01:00
Laurent Destailleur
6d13e58a23 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-06 09:07:03 +01:00
Laurent Destailleur
a765dba570 Fix trad 2018-03-06 09:06:49 +01:00
Laurent Destailleur
5de43d6652
Merge pull request #8273 from fappels/7.0_fix_insert_expedition_line 
Fix shipment line insert
 2018-03-05 20:47:03 +01:00
Laurent Destailleur
81e193b725
Update expedition.class.php 2018-03-05 20:46:54 +01:00
Laurent Destailleur
951babae6d
Merge pull request #8272 from aspangaro/7.0 
Fix : Missing language file
 2018-03-05 20:44:34 +01:00
Laurent Destailleur
65fe376bbf
Merge pull request #8270 from hregis/7.0_bug4 
Fix: avoid Warning: A non-numeric value encountered
 2018-03-05 20:44:23 +01:00
Laurent Destailleur
45898d26a8
Merge pull request #8267 from hregis/7.0_bug5 
Fix: check if file name already exists
 2018-03-05 20:44:02 +01:00
atm-ph
5971cd8e59 Fix label goes in desc and lost fourn ref 2018-03-05 17:18:03 +01:00
atm-ph
ebb4da8417 Fix keep supplier proposal price in supplier order 2018-03-05 16:58:35 +01:00
Laurent Destailleur
0b3e2e92e2 Revert "Fix SQL error when creating subscription" 
This reverts commit d422fc8a11.
 2018-03-05 16:13:32 +01:00
Laurent Destailleur
d422fc8a11 Fix SQL error when creating subscription 2018-03-05 16:09:26 +01:00
Laurent Destailleur
184c773301 Fix error management 2018-03-05 15:43:48 +01:00
Laurent Destailleur
f35679fb2a Fix description of field of table 2018-03-05 13:11:07 +01:00
Regis Houssin
722fbc9d29 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_bug5 2018-03-05 10:25:23 +01:00
ATM-Nicolas
60f8ca1283 Merge branch '6.0' of github.com:Dolibarr/dolibarr into fix_order_line_fk_multicurrency 2018-03-05 09:03:20 +01:00
fappels
1a7c09b7d5 Fix 0 is also a valid Qty 
Fix error handling
 2018-03-04 12:35:32 +01:00
Alexandre SPANGARO
c0664474e4 Fix : Missing language file 2018-03-04 06:32:55 +01:00
Laurent Destailleur
44eb50c424 FIX Infinite loop on deletion of temp file when there is symbolic links 2018-03-03 11:57:10 +01:00
Laurent Destailleur
eac1b2efe9 FIX Infinite loop on deletion of temp file when there is symbolic links 2018-03-03 11:23:23 +01:00
Regis Houssin
0c52977027 Fix: avoid Warning: A non-numeric value encountered 2018-03-03 08:37:44 +01:00
Regis Houssin
647331876b Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_bug5 2018-03-02 19:02:08 +01:00
Regis Houssin
b69d2800ef Fix: check if file name already exists 2018-03-02 18:59:30 +01:00
Laurent Destailleur
b24259ed46
Merge pull request #8265 from hregis/7.0_bug5 
Fix: missing hook during rename file action
 2018-03-02 18:15:01 +01:00
Regis Houssin
8e85198bd1 Fix: missing $upload_dir 2018-03-02 18:09:06 +01:00
Laurent Destailleur
4137e1cc76 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-02 17:56:30 +01:00
Laurent Destailleur
6bb91dd5d2 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-03-02 17:54:42 +01:00
Laurent Destailleur
d35c5282d4
Merge pull request #8245 from enstentechnologies/7.0 
FIX Unknown column 'pl.amount_requested' in compta/prelevement/factures.php
 2018-03-02 17:52:23 +01:00
florian HENRY
3490d3779b Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0 2018-03-02 17:31:39 +01:00
florian HENRY
473c16ede5 fix pgSQL install 2018-03-02 17:30:46 +01:00
Regis Houssin
bf4543a636 Fix: missing hook during rename file action 2018-03-02 17:05:52 +01:00
Laurent Destailleur
b87db9d32d Fix missing ; 2018-03-02 16:38:56 +01:00
Laurent Destailleur
8d11f1efa1 FIX Payment mode not correctly set in donation and document 2018-03-02 12:32:49 +01:00
Laurent Destailleur
a01287b211 Fix template donation 2018-03-02 12:25:43 +01:00
Laurent Destailleur
c478ab952f Fix block to generate donation document missing 2018-03-02 11:57:39 +01:00
Laurent Destailleur
a815326a28 Fix filters on bank entry list 2018-03-01 12:37:03 +01:00
Laurent Destailleur
54edd51847 Fix look and feel v7 2018-03-01 12:07:19 +01:00
Laurent Destailleur
822dd4778c Fix info in tooltip 2018-03-01 12:03:50 +01:00