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

58994 Commits

Author SHA1 Message Date
Laurent Destailleur
e993a41160
Update modFournisseur.class.php 2018-06-18 11:24:58 +02:00
Laurent Destailleur
5632228153
Update modFournisseur.class.php 2018-06-18 11:23:36 +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
ca5f27636b
Merge pull request #8978 from grandoc/new_branch_17_06_2018 
clean and update code
 2018-06-18 11:16:00 +02:00
Laurent Destailleur
9d048281dc
Merge pull request #8970 from inoveaconseil/FixParamGenerateDocument 
Fix missing params on generateDocument
 2018-06-18 11:14:49 +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
5d56969bd9
Merge pull request #8977 from hythamsoliman81/dolibarr-fixes 
FIX: SQL syntax error at llx_website_page.sql
 2018-06-18 10:41:45 +02:00
Laurent Destailleur
63fb82931c
Update functions.lib.php 2018-06-18 10:41:11 +02:00
Philippe GRAND
ddbf5e59e1 clean and update code 2018-06-18 10:12:19 +02:00
Philippe GRAND
4c08e2ebf3 clean and update code 2018-06-17 14:33:29 +02:00
Laurent Destailleur
7c7ee56832 Fix missing email 
Fix avoid warning
 2018-06-17 01:50:10 +02:00
hythamsoliman81
f461ab5f96 SQL synatx error at llx_website_page.sql 2018-06-17 00:12:06 +02:00
Laurent Destailleur
dcd43b715a Fix look and feel v8 2018-06-16 23:51:30 +02:00
Laurent Destailleur
187127ce6f Fix CSS 2018-06-16 21:19:50 +02:00
Laurent Destailleur
8c748505db Use parent instead of parents 2018-06-16 17:25:16 +02:00
Laurent Destailleur
7ad086bbdf FIX Duplicate select2 when we split a supplier order receipt item 2018-06-16 17:18:17 +02:00
Laurent Destailleur
5524784421 FIX prefilled date of order must have hours too 2018-06-16 15:24:31 +02:00
Laurent Destailleur
186f08e67b Fix preview of PDF for supplier objects 2018-06-16 15:08:13 +02:00
Laurent Destailleur
7981bd08b7 Fix price+sql error when adding product when no supplier price defined 2018-06-16 14:47:33 +02:00
Laurent Destailleur
4898f10fa2 FIX Adding a product with no supplier price defined yet 2018-06-16 13:49:28 +02:00
Laurent Destailleur
92952aea28 Trans 2018-06-16 13:23:58 +02:00
Laurent Destailleur
5908fc1471 Trans 2018-06-16 13:15:24 +02:00
Laurent Destailleur
c0d4715bdb Clean code 2018-06-15 16:29:26 +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
Laurent Destailleur
79cbdf7fd1 Code comment 2018-06-15 15:29:19 +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
Inovea Conseil
d5a3e63e05 Fix missing paramater for generateDocument 2018-06-15 09:47:28 +02:00
Laurent Destailleur
df28be443b Add syslog module in list of module reloaded in last migration step 2018-06-14 23:00:42 +02:00
Laurent Destailleur
f5c08c4b9f Doc website 2018-06-14 16:38:20 +02:00
Laurent Destailleur
25d656025a Fix use of alternative aliases is ok now 2018-06-14 16:33:11 +02:00
Laurent Destailleur
b37f7a6953 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-06-14 16:15:34 +02:00
Laurent Destailleur
e28aca6244 Fix workaround against p insertion by ckeditor 2018-06-14 16:15:06 +02:00
Regis Houssin
f9a86ba43f Fix: MEMBER_MODIFY trigger not called if i change only extrafields 2018-06-14 14:01:05 +02:00
Laurent Destailleur
9717a32a2e
Merge pull request #8960 from grandoc/new_branch_13_06_2018 
clean code
 2018-06-14 12:01:19 +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
Laurent Destailleur
f79466d483 Trans 2018-06-14 11:41:14 +02:00
Marc de Lima Lucio
a5898b830b Merge branch 'develop' of github.com:Dolibarr/dolibarr into 7.0 2018-06-14 10:48:09 +02:00
Marc de Lima Lucio
a80e1c601c NEW: supplier order/order lines export: add supplier product ref 2018-06-14 10:43:01 +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
4900f1f1f1 Fix sql coding style 2018-06-13 23:10:29 +02:00
Laurent Destailleur
910652eb6d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/admin.lang
 2018-06-13 23:07:30 +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
a15cfd23f0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-06-13 22:57:51 +02:00
Laurent Destailleur
4a5fd35e11 Look and feel v8 2018-06-13 22:57:41 +02:00
Philippe GRAND
a937d9e657 clean code 2018-06-13 22:52:24 +02:00
Laurent Destailleur
c5887c1ec7
Merge pull request #8399 from ptibogxiv/patch-23 
FIX lang for support more type of stripeconnect account
 2018-06-13 22:13:43 +02:00
Laurent Destailleur
094b31a563 Complete migration 2018-06-13 21:46:55 +02:00
Laurent Destailleur
ed41731a50
Merge pull request #8954 from mwelters/develop 
German Accounting Plan SKR03 and SKR04 (mysql/data)
 2018-06-13 21:45:02 +02:00
Laurent Destailleur
c09e69aeb6
Update llx_accounting_abc.sql 2018-06-13 21:44:43 +02:00
Laurent Destailleur
8d1456fb7f
Merge pull request #8949 from atm-greg/Manage_product_units_in_supplier_proposal 
add product units management in supplier proposal documents
 2018-06-13 21:41:39 +02:00
Laurent Destailleur
aaa6565014
Merge pull request #8938 from HackLo/develop 
FIX: Link does not work when there is spaces in SIREN
 2018-06-13 21:39:54 +02:00
Laurent Destailleur
6881fda744
Merge pull request #8934 from grandoc/new_branch_08_06_2018 
New branch 08 06 2018
 2018-06-13 21:38:46 +02:00
Laurent Destailleur
074ada10e6
Merge pull request #8940 from aspangaro/8.0-b33 
Fix : Migration for Romanian chart of accounts
 2018-06-13 21:37:50 +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
bc0080b945
Merge pull request #8945 from bafbes/abb7009 
Fix: Do not activate module if errors found on execution of module SQL queries
 2018-06-13 21:28:04 +02:00
Laurent Destailleur
98ae8e18df
Update modMyModule.class.php 2018-06-13 21:27:57 +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
4b84b7ccf2
Merge pull request #8926 from fappels/develop_fix_setvaluefrom 
FIX commonobject setValueFrom trigger
 2018-06-13 20:50:26 +02:00
Laurent Destailleur
916424943e
Merge pull request #8942 from grandoc/new_branch_10_06_2018 
New branch 10 06 2018
 2018-06-13 20:48:22 +02:00
Laurent Destailleur
e69b0102a5
Merge pull request #8935 from inoveaconseil/modulebuilder 
Fix include for older version
 2018-06-13 20:43:38 +02:00
Laurent Destailleur
4be069a3b5
Update setup.php 2018-06-13 20:43:02 +02:00
Laurent Destailleur
e983566422
Merge pull request #8947 from glu000/develop 
Fix for Bug #8946
 2018-06-13 20:41:54 +02:00
Laurent Destailleur
dd8e39195d
Merge pull request #8932 from grandoc/new_branch_07_06_2018 
New branch 07 06 2018
 2018-06-13 20:40:48 +02:00
Laurent Destailleur
3703a7c4b0
Merge pull request #8952 from papoteur-mga/patch-1 
Fix: In list of bank accounts, display the balance in formatted price
 2018-06-13 20:40:27 +02:00
Laurent Destailleur
4acde4e0a9
Merge pull request #8950 from ATM-Marc/FIX_develop_sortfield 
FIX: handle sortorder on multiple columns + potential SQL field mismatch
 2018-06-13 20:36:08 +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
b8e927d347
Merge pull request #8915 from grandoc/new_branch_04_06_2018 
clean and update code
 2018-06-13 20:16:19 +02:00
Laurent Destailleur
3ec6b88ece
Merge pull request #8958 from frederic34/listfax 
FIX add fax to thirdparty list
 2018-06-13 20:10:10 +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
49d749a4b9
Merge pull request #8920 from grandoc/new_branch_05_06_2018 
clean and update code
 2018-06-13 20:04:41 +02:00
Laurent Destailleur
887c9e0495
Merge pull request #8922 from aspangaro/8.0-b31 
NEW Accountancy - Show journal name on journal page and hide button draft export (Add an option in admin)
 2018-06-13 20:04:16 +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
1e488a6f7f
Merge pull request #8924 from dtix/patch-1 
Romania vat rate changed
 2018-06-13 20:01:48 +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
Laurent Destailleur
6fbdcea356 Code comment 2018-06-13 19:22:50 +02:00
Frédéric FRANCE
345fb1f2af
add fax to thirdparty list 2018-06-13 17:57:15 +02:00
Laurent Destailleur
03b6bec8b8 Fix email template for test 2018-06-13 17:03:46 +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
Laurent Destailleur
cfa69fe93f FIX popup confirmation deos not accept value with special chars 2018-06-13 14:51:20 +02:00
Laurent Destailleur
50aa674ebc Fix support of 'help' field property. Fix bad td closing. 2018-06-13 13:36:40 +02:00
Laurent Destailleur
f4bef82bfa Fix td not closed and js code duplicated (at wrong place) 2018-06-13 13:00:08 +02:00
Laurent Destailleur
ff002a45e0 Missing trans 2018-06-13 11:50:06 +02:00
Markus Welters
885904132c
Update llx_accounting_abc.sql 2018-06-13 09:37:12 +02:00
Papoteur
6567365086
In list of bank accounts, display the balance in formatted price 
[Problem to solve]
in compta/bank/list.php, the balance can be displayed witht decimal or not. This is not fine.
[Solution]
Change a parameter in the price function to format the balance with the required number of decimals.
 2018-06-13 08:39:26 +02:00
Laurent Destailleur
b1986a8d2e Fix trans 2018-06-12 19:22:28 +02:00
fappels
a86c90fed1 Fix Wrong error for duplicate ref if barcode enabled but not set. 2018-06-12 16:38:42 +02:00
Marc de Lima Lucio
e992187f4c FIX: handle sortorder on multiple columns + potential SQL field mismatch 2018-06-12 16:00:16 +02:00
atm-greg
d14f40f722 add product units management in supplier proposal documents 2018-06-12 14:36:32 +02:00
Laurent Destailleur
4313e41580 Start to fix pb with 3DS 2018-06-12 13:47:28 +02:00
Günter Lukas
fcbf50467e
Update user.class.php 2018-06-12 09:52:55 +02:00
Günter Lukas
3c42a282f5
Fix for Bug #8946 
Add element fields to class user
 2018-06-12 09:48:03 +02:00
Abbes Bahfir
2f759e0c18 Fix: Do not activate module if errors on module SQL queries execution 2018-06-12 00:43:01 +01:00
Laurent Destailleur
94919d6e99 Translation 2018-06-11 15:17:05 +02:00
Laurent Destailleur
5ae1395acd Fix js when no data 2018-06-11 14:22:01 +02:00
Laurent Destailleur
1d7d16649a Code comment 2018-06-11 12:31:26 +02:00
Laurent Destailleur
d6a84b0685 FIX Sync third party change to Stripe only if we change Stripe data 2018-06-11 11:47:10 +02:00
Laurent Destailleur
eb8d67483b Fix message error 2018-06-11 10:40:57 +02:00
Laurent Destailleur
b5586af56e Fix js error 2018-06-11 10:38:04 +02:00
Laurent Destailleur
ab93909402 Fix url test 2018-06-11 10:36:50 +02:00
Laurent Destailleur
8978208080 Check url 2018-06-11 10:34:54 +02:00
Laurent Destailleur
f0446d2a3b Fix for content editable sites 2018-06-11 10:25:22 +02:00
Laurent Destailleur
557db7661c Fix for content editable sites 2018-06-11 10:19:42 +02:00
Laurent Destailleur
7562c13fad The about page is now a README.md file 2018-06-11 09:32:41 +02:00
Laurent Destailleur
ab5ed6a3b5 Fix rename of ticket language file 2018-06-11 09:31:31 +02:00
Laurent Destailleur
b67a86843b Fix sql error 2018-06-11 09:22:50 +02:00
Laurent Destailleur
64537ba9bf Fix missing field in install 2018-06-11 09:20:26 +02:00
Philippe GRAND
5021c7a556 clean and update code 2018-06-10 18:29:04 +02:00
Philippe GRAND
f1f56ca5e9 Merge remote-tracking branch 'upstream/develop' into develop 2018-06-10 18:09:24 +02:00
Alexandre SPANGARO
c7e6ee3a1b Fix : Migration for Romanian chart of accounts 2018-06-10 04:02:35 +02:00
markus
f3a7e2205b fix typo 2018-06-09 19:07:33 +02:00
markus
9ce10ccef7 Adding SKR03 and SKR04 2018-06-09 19:00:24 +02:00
Laurent Destailleur
31eeaf9914 Trans 2018-06-09 13:46:42 +02:00
Loïc Barouty
945b71d6af FIX: Link does not work when there is spaces in SIREN (like in the main format) 2018-06-08 23:38:44 +02:00
Laurent Destailleur
758e5a51a5 Fix contextpage was not saved in forms 2018-06-08 19:35:53 +02:00
Laurent Destailleur
eb9321f2b8 css 2018-06-08 17:53:13 +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
Laurent Destailleur
95d5a1088b Fix error on sql error (field does not exists) 2018-06-08 16:49:14 +02:00
Inovea Conseil
75bb5c1624 Fix include for older version 2018-06-08 16:01:09 +02:00
Laurent Destailleur
485dc9a57a Clean code 2018-06-08 15:37:25 +02:00
Philippe GRAND
8f777a513b clean and update code 2018-06-08 10:33:52 +02:00
Philippe GRAND
4dc42f65da Merge remote-tracking branch 'upstream/develop' into develop 2018-06-08 09:49:03 +02:00
Laurent Destailleur
fb8dd2f32b FIX TCPDF is generated PDF 1.7 but TCPDI was setting version to 1.3 2018-06-08 09:37:26 +02:00
Laurent Destailleur
8142a672a7 PDF compatibility. Use hidden option to force PDF1/A instead of PDF-1.3 2018-06-07 21:12:30 +02:00
Laurent Destailleur
df7e9fccdd Autofill alias 2018-06-07 19:12:18 +02:00
Philippe GRAND
9a44a433b8 clean code 2018-06-07 18:32:00 +02:00
Philippe GRAND
4fd2468b6f clean code 2018-06-07 18:13:00 +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
Laurent Destailleur
8aa7956b4f Fix missing extraparams field in insert action 2018-06-07 12:53:06 +02:00
Laurent Destailleur
186df884fa Trans 2018-06-07 09:37:12 +02:00
Laurent Destailleur
929a44d7ca Fix dir of contract for multicompany 2018-06-06 23:56:59 +02:00
Laurent Destailleur
d10c9cf565 FIX dir for modules must not have s at end (fix contracts into contract) 2018-06-06 23:47:48 +02:00
Laurent Destailleur
76f0236bb6 Fix empty page 2018-06-06 23:13:49 +02:00
fappels
a9f60bcdac fix travis 2018-06-06 22:04:12 +02:00
Laurent Destailleur
a7b38db31f Fix bug reported by scrutinizer 2018-06-06 18:55:50 +02:00
Laurent Destailleur
b57f3a3f36 Fix bug reported by scrutinizer 2018-06-06 18:41:35 +02:00
Laurent Destailleur
6b24d81afc Fix bug reported by scrutinizer 2018-06-06 18:40:56 +02:00
Laurent Destailleur
a8e06abc4f Fix bug reported by scrutinizer 2018-06-06 18:35:11 +02:00
Laurent Destailleur
f9a24c53c0 Fix bug reported by scrutinizer 2018-06-06 18:20:31 +02:00
Laurent Destailleur
6e62727c37 Fix scrutinizer bug 2018-06-06 18:18:50 +02:00
Laurent Destailleur
bb97119233 Fix duplicate function name 2018-06-06 18:07:32 +02:00
fappels
141d19571c Add modify trigger to barcode modify. 2018-06-06 17:11:34 +02:00
fappels
81ef355b65 Fix trigger on setValueFrom 
Load updated values into object for trigger.
 2018-06-06 17:10:46 +02:00
Laurent Destailleur
002181190c Fix option not used 2018-06-06 15:28:50 +02:00
dtix
e6da000ae8
Romania vat rate changed 2018-06-06 14:48:11 +03:00
Laurent Destailleur
74890ce656 Sync transifex 2018-06-06 12:02:33 +02:00
Laurent Destailleur
ac721b46bc Trans 2018-06-06 11:16:42 +02:00
Laurent Destailleur
35ed49e575 Trans 2018-06-06 10:42:41 +02:00
Laurent Destailleur
5ea1890f0c Fix payments on contract line 2018-06-06 10:28:53 +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
Alexandre SPANGARO
f2c04c5653 Accountancy - Show journal name on journal page and hide button draft export (Add an option in admin) 2018-06-05 20:37:39 +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
1671c8b6cc Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-06-05 18:06:30 +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
Laurent Destailleur
f28a6e59c8 Look and feel v8 2018-06-05 16:30:16 +02:00
Philippe GRAND
82bb1c8806 clean and update code 2018-06-05 14:29:25 +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
8d62c06653 css 2018-06-05 11:25:41 +02:00
Laurent Destailleur
b6955692b4 Fix autofill of password 2018-06-05 11:22:00 +02:00
Laurent Destailleur
9730138845 Code comment 2018-06-05 11:06:44 +02:00
Laurent Destailleur
7cb66e8e0c Fix reset of filters 2018-06-05 10:04:57 +02:00
Laurent Destailleur
e7f6a5112c Bad picto 2018-06-05 09:02:50 +02:00
Laurent Destailleur
7c82c74b6b Fix install check 2018-06-05 08:57:04 +02:00
Laurent Destailleur
87d073b5cd Fix conflict with external ticketsup module 2018-06-04 21:49:29 +02:00
Philippe GRAND
909fa496e5 clean and update code 2018-06-04 17:37:17 +02:00
Laurent Destailleur
7a8fac4198 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/list.php
 2018-06-04 15:14:26 +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
69dd11f7c6 Fix: Must use a standard (internationnal) date format. 2018-06-04 14:05:47 +02:00
Laurent Destailleur
eca66492ce
Merge pull request #8913 from aspangaro/8.0-a26 
NEW : Accountancy Add import on general ledger
 2018-06-04 14:02:34 +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
Laurent Destailleur
40ab046bd1
Merge pull request #8904 from Mavyre/develop 
FIX Errors on synchronize rates when accessing Dolibarr from HTTPS
 2018-06-04 13:46:03 +02:00
Laurent Destailleur
5f4932c0b0
Merge pull request #8902 from bgenere/develop 
FIX extrafield template for list and resource list with extrafields
 2018-06-04 13:44:14 +02:00
Laurent Destailleur
54023d1029
Update list.php 2018-06-04 13:42:30 +02:00
Laurent Destailleur
af974430f5
Merge pull request #8901 from defrance/patch-119 
Add Hook on getNomUrl
 2018-06-04 13:36:46 +02:00
Laurent Destailleur
61946446b2
Update fichinter.class.php 2018-06-04 13:36:38 +02:00
Laurent Destailleur
da44ea858c Trans 2018-06-04 13:35:30 +02:00
Laurent Destailleur
eaee252a5d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-06-04 12:56:12 +02:00
Laurent Destailleur
29ee5dffc4 Clean code 2018-06-04 12:55:55 +02:00
Laurent Destailleur
60ce5fb87e
Merge pull request #8911 from fappels/develop_fix_properties_for_trigger 
FIX stock movement trigger is missing some data
 2018-06-04 12:20:47 +02:00
Laurent Destailleur
536e8297c2
Merge pull request #8897 from areaeuro/patch-3 
FIX Delete thirdparty logo
 2018-06-04 12:19:41 +02:00
Alexandre SPANGARO
a3030e4057 Update works 2018-06-03 22:35:39 +02:00
fappels
e0f9605483 Fix add missing properties for trigger 2018-06-03 11:05:02 +02:00
Laurent Destailleur
a6104d18a9 CSS 2018-06-02 16:36:05 +02:00
Laurent Destailleur
034ce7e55d CSS 2018-06-02 10:36:22 +02:00
Laurent Destailleur
5ff3398048 Try to fix evil Google Chrome autopopulate bug 2018-06-01 18:27:17 +02:00
Laurent Destailleur
be2c49d490 Fix log 2018-06-01 17:39:07 +02:00
Laurent Destailleur
b094ae953e Better log 2018-06-01 17:20:49 +02:00
Laurent Destailleur
3f6d11cf26 Fix log 2018-06-01 16:23:42 +02:00