63009 Commits

Author	SHA1	Message	Date
Juanjo Menent	0e1c4d92da	Merge pull request #10112 from inoveaconseil/patch-2 ... Fix missing translation	2018-11-30 23:59:29 +01:00
Juanjo Menent	d1df592c7e	Merge pull request #10110 from atm-maxime/fix_supp_pay_specimen ... Fix #9074	2018-11-30 23:57:49 +01:00
Juanjo Menent	859d6c4401	Merge pull request #10109 from atm-maxime/fix_dupl_code ... Fix #9070	2018-11-30 23:57:32 +01:00
Juanjo Menent	a57a43fc05	Merge pull request #10104 from inoveaconseil/MassClose ... FIX mass action closed proposal	2018-11-30 23:56:38 +01:00
Juanjo Menent	70d75caf09	Merge pull request #10096 from ptibogxiv/patch-98 ... Fix trans	2018-11-30 23:54:36 +01:00
Inovea Conseil	6201962dcf	Fix missing translation	2018-11-30 23:27:05 +01:00
florian HENRY	7a182c7880	fix #10069	2018-11-30 23:25:44 +01:00
Maxime Kohlhaas	e8a02a971d	Fix #9074	2018-11-30 23:05:12 +01:00
Maxime Kohlhaas	7585461486	Fix #9070	2018-11-30 22:16:17 +01:00
Maxime Kohlhaas	5dcb3d2a1f	Fix extrafields in import tool	2018-11-30 19:23:05 +01:00
Laurent Destailleur	2dc6351593	Fix website import	2018-11-30 15:16:17 +01:00
Inovea Conseil	ad7117be60	FIX mass action closed proposal	2018-11-30 15:05:28 +01:00
Laurent Destailleur	7a4c1cddc8	Fix save master file of a website	2018-11-30 14:46:44 +01:00
Laurent Destailleur	e8d29c644b	Fix grab web site	2018-11-30 14:30:00 +01:00
Laurent Destailleur	94c2d7194c	Trans Website	2018-11-30 12:41:35 +01:00
Laurent Destailleur	4260d5765f	Fix bad trans key	2018-11-30 11:50:32 +01:00
Laurent Destailleur	6fbf292a95	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2018-11-30 11:01:36 +01:00
Laurent Destailleur	dd357d167a	Update ChangeLog	2018-11-30 11:00:42 +01:00
IJ	95be3976c4	NEW: Add Autofill Remainder Amount to Expense Report Payment Page	2018-11-29 22:37:07 +00:00
ptibogxiv	e8bdb580ab	Fix trans	2018-11-29 14:00:27 +01:00
ptibogxiv	310dc46113	Update list.php	2018-11-29 13:44:42 +01:00
ptibogxiv	31e3b82ca6	Fix duration display product/service in list.php	2018-11-29 13:44:10 +01:00
Laurent Destailleur	539d993666	Fix translation of month	2018-11-29 12:20:47 +01:00
Laurent Destailleur	bbfd134733	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-29 11:24:18 +01:00
Laurent Destailleur	ea3e58a390	Merge pull request #10090 from hregis/8.0_bug3 ... FIX remove constant for avoid problem	2018-11-29 11:18:29 +01:00
Laurent Destailleur	d5c28a76d8	Merge pull request #10079 from aljawaid/aljawaid-fix_payment_type ... FIX: Display All Types of Payments on Expense Report Card	2018-11-29 11:17:31 +01:00
Laurent Destailleur	b15403207b	Merge pull request #10077 from aspangaro/9.0p1 ... Fix create accounting account from balance	2018-11-29 11:16:27 +01:00
Laurent Destailleur	950dfeef58	Merge pull request #10081 from oscim/patch-1 ... Update company.lib.php	2018-11-29 11:15:52 +01:00
Laurent Destailleur	f3ce49806d	Update company.lib.php	2018-11-29 11:15:27 +01:00
Laurent Destailleur	163bc3784e	Merge pull request #10076 from ptibogxiv/patch-96 ... Fix retrieve Donation newpayment.php	2018-11-29 11:14:33 +01:00
Laurent Destailleur	9e20d9e847	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-29 11:03:16 +01:00
Laurent Destailleur	10fc0149d8	responsive	2018-11-29 11:03:02 +01:00
Laurent Destailleur	6e21b372d1	Merge pull request #10094 from defrance/patch-125 ... Duplicate declaration of $object	2018-11-29 10:58:36 +01:00
Laurent Destailleur	ef3a280f40	Merge pull request #10082 from grandoc/new_branch_26_11_2018 ... fix typo error	2018-11-29 10:57:48 +01:00
Laurent Destailleur	a460452101	Merge pull request #10086 from bafbes/abb80044 ... fix: Access to global $conf needed	2018-11-29 10:57:21 +01:00
Laurent Destailleur	05f1e5f16b	Merge pull request #10089 from grandoc/new_branch_28_11_2018 ... FIX: bad URL	2018-11-29 10:57:08 +01:00
Laurent Destailleur	2808876904	Merge pull request #10084 from grandoc/new_branch_27_11_2018 ... fix : typo error	2018-11-29 10:56:53 +01:00
BENKE Charlene	10bf7bdc95	Duplicate declaration of $object ... Already present line 126	2018-11-29 10:29:04 +01:00
Laurent Destailleur	c5bd11951f	Fix bar not visible on some screen	2018-11-29 02:09:07 +01:00
Laurent Destailleur	bfc2f6e84c	Add template	2018-11-29 00:48:47 +01:00
Laurent Destailleur	af2150a427	CSS	2018-11-29 00:45:15 +01:00
Laurent Destailleur	3c0ff40e43	Fix trans	2018-11-29 00:41:12 +01:00
Laurent Destailleur	619ec1f0cb	Fix trans	2018-11-29 00:40:18 +01:00
Laurent Destailleur	3650543749	CSS	2018-11-28 22:51:24 +01:00
Laurent Destailleur	23126fe49a	CSS	2018-11-28 17:14:13 +01:00
Regis Houssin	b4aa9ee335	FIX remove constant for avoid problem	2018-11-28 17:04:42 +01:00
Laurent Destailleur	ca1f9c7e60	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/don/class/don.class.php htdocs/langs/es_ES/admin.lang htdocs/langs/es_ES/sendings.lang htdocs/langs/es_ES/stocks.lang	2018-11-28 16:57:39 +01:00
Laurent Destailleur	b9c08853be	CSS	2018-11-28 16:54:21 +01:00
Philippe GRAND	2b6810e2ab	FIX: bad URL	2018-11-28 16:37:49 +01:00
Laurent Destailleur	28902e18ee	Fix for screen with antiblue system	2018-11-28 16:32:53 +01:00
ptibogxiv	21f4d474b4	Fix sql don.class.php	2018-11-28 16:11:10 +01:00
Laurent Destailleur	0373cad2cd	FIX Method setValid not found	2018-11-28 16:11:00 +01:00
Marc de Lima Lucio	c13cc5d697	FIX: form actions: select_type_actions could be too small + bad init	2018-11-28 15:46:27 +01:00
Laurent Destailleur	3b66a2bf9c	Fix missing email in popup	2018-11-28 14:20:55 +01:00
AurelienGoudeneche	4282a46bb2	Add files via upload ... revert previous comment l44	2018-11-28 13:20:44 +01:00
Laurent Destailleur	dbef8fc380	FIX Add field for data becoming mandatory by some online payment system	2018-11-28 13:13:38 +01:00
Laurent Destailleur	01181ba3a4	Fix avoid warning	2018-11-28 13:06:39 +01:00
AurelienGoudeneche	2edaa0e1d9	Add files via upload	2018-11-28 13:05:59 +01:00
AurelienGoudeneche	4d9e64bfcf	Add files via upload	2018-11-28 13:04:59 +01:00
Laurent Destailleur	d59c81cfe4	Fix missing or	2018-11-28 11:47:24 +01:00
Juanjo Menent	2f61d29b06	FIX: #10080 Supplier translations are in english	2018-11-28 10:40:45 +01:00
Laurent Destailleur	436a85ef7a	Fix missing email	2018-11-27 20:34:43 +01:00
Abbes Bahfir	1a8882198e	fix: Accss to global $conf needed	2018-11-27 18:22:12 +01:00
Laurent Destailleur	a4fc564048	css	2018-11-27 18:04:45 +01:00
Laurent Destailleur	780a538fe0	Fix multicompany not accessible from website.	2018-11-27 17:37:39 +01:00
Laurent Destailleur	bb565d33f9	FIX Several fixes in fetchAll	2018-11-27 16:39:08 +01:00
Laurent Destailleur	0b6aaccfcc	sync transifex	2018-11-27 16:35:47 +01:00
Laurent Destailleur	70bd931d08	FIX empty page due to preg_replace JIT error on large strings	2018-11-27 16:20:31 +01:00
Ferran Marcet	9d6c95e8a9	Merge remote-tracking branch 'upstream/7.0' into 7.0	2018-11-27 11:39:07 +01:00
Ferran Marcet	d8537a3c76	FIX Lines are not inserted correctly if VAT have code	2018-11-27 11:36:31 +01:00
Laurent Destailleur	e95c6091c4	Fix lang	2018-11-27 11:10:39 +01:00
Laurent Destailleur	0367795488	Fix auto jump on record if only 1 record in a search	2018-11-27 11:09:47 +01:00
Laurent Destailleur	71bcabd8eb	Missing trans	2018-11-27 10:23:58 +01:00
Philippe GRAND	30d30d9c1e	fix : typo error	2018-11-27 10:06:38 +01:00
Laurent Destailleur	7c22504252	Fix position of field must be ssame between create/edit/view	2018-11-27 09:22:59 +01:00
IJ	0bdbff6419	Add Access Key Language Strings	2018-11-27 00:24:11 +00:00
IJ	825f41bfda	Add Access Keys in Navigation Tooltips	2018-11-27 00:22:21 +00:00
IJ	f0b1a9358a	Add Access Keys in Help Link	2018-11-27 00:14:28 +00:00
Laurent Destailleur	b9e544d291	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/functions.lib.php htdocs/resource/list.php	2018-11-26 23:08:06 +01:00
Laurent Destailleur	b5c136bc32	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-26 23:02:23 +01:00
Laurent Destailleur	653b99cb33	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-26 23:02:07 +01:00
Laurent Destailleur	84d73086ea	Fix bookkeeping list was empty	2018-11-26 22:53:56 +01:00
Laurent Destailleur	2f2df12f59	Complete dictionary	2018-11-26 18:02:25 +01:00
Philippe GRAND	a59a4c60e0	FIX : Typo errors	2018-11-26 16:09:05 +01:00
Philippe GRAND	52f587e1e3	merging	2018-11-26 16:05:53 +01:00
oscim	f5ebcca475	error space after comment	2018-11-26 15:47:51 +01:00
Laurent Destailleur	12b9ac2c3b	Fix lang	2018-11-26 14:48:27 +01:00
Laurent Destailleur	62e39f5a31	Fix title	2018-11-26 14:37:19 +01:00
Philippe GRAND	8722ccef82	fix typo error	2018-11-26 14:35:29 +01:00
Philippe GRAND	05d617b759	fix typo error	2018-11-26 14:33:45 +01:00
Philippe GRAND	9bf0f12068	fix typo error	2018-11-26 14:32:04 +01:00
Philippe GRAND	3800fde225	fix typo error	2018-11-26 14:29:25 +01:00
Laurent Destailleur	f0ab6e60ec	FIX Loading translation of cron tasks	2018-11-26 13:31:05 +01:00
Laurent Destailleur	8f15fe9c63	Empty lines	2018-11-26 12:41:10 +01:00
Laurent Destailleur	611569f639	Add missing translation	2018-11-26 11:18:01 +01:00
oscim	2af24903e9	Update company.lib.php ... Fix list in agenda for tab customer / provider , no thirdparty selected because name of class is not Societe	2018-11-26 10:53:34 +01:00
IJ	db719dbcbb	FIX: Display All Types of Payments on Expense Report Card ... Fixes #9991 - Bug: 7.0.4: Expense Report Payment Type Not Displayed - without this fix, only cash type accounts were shown when payment was made	2018-11-25 20:36:25 +00:00
Laurent Destailleur	4bb8568d6c	Fix doxygen	2018-11-25 12:18:45 +01:00
Laurent Destailleur	a395e9e4ee	Fix var not defined	2018-11-25 12:13:35 +01:00
Laurent Destailleur	2e139d1960	Fix var $hidedetails not defined	2018-11-25 12:08:49 +01:00
Laurent Destailleur	ed1062c440	Css	2018-11-25 11:59:49 +01:00
Laurent Destailleur	1d2c2a23ef	Fix look and feel v8	2018-11-25 11:57:19 +01:00
Alexandre SPANGARO	703d3d90eb	Revert "Fix create accounting account from balance" ... This reverts commit 9154fd366f.	2018-11-24 22:40:04 +01:00
Alexandre SPANGARO	9154fd366f	Fix create accounting account from balance	2018-11-24 22:30:06 +01:00
ptibogxiv	d401974028	Fix retrieve Donation newpayment.php	2018-11-24 15:33:48 +01:00
Laurent Destailleur	099f47deba	Merge pull request #10019 from frederic34/swiftmailer ... Swiftmailer	2018-11-24 11:54:47 +01:00
Laurent Destailleur	82b4b3ccb3	Merge pull request #10047 from frederic34/patch-9 ... doc cmail class	2018-11-24 11:20:49 +01:00
Laurent Destailleur	2fcd221dbb	Merge pull request #10048 from frederic34/patch-15 ... Update fournisseur.commande.class.php	2018-11-24 11:20:21 +01:00
Laurent Destailleur	ecb6ea9151	Merge pull request #10058 from frederic34/patch-2 ... correct link and avoid warning in resource list	2018-11-24 11:17:56 +01:00
Laurent Destailleur	f0e4c262a3	Merge pull request #10067 from ATM-Thibault/NEW_global_search_go_direct_on_card ... FIX Support of option MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE was not complete	2018-11-24 11:13:49 +01:00
Laurent Destailleur	ff857c0144	Merge pull request #10064 from frederic34/pdfexpensereport ... try to fix the expensereport pdf	2018-11-24 11:11:26 +01:00
Laurent Destailleur	1398b94a80	Merge pull request #10062 from ptibogxiv/patch-94 ... Fix sql don.class.php	2018-11-24 11:08:39 +01:00
Laurent Destailleur	0cc4ee2b01	Merge pull request #10073 from ptibogxiv/patch-95 ... Fix order&co billed on online payment page	2018-11-24 11:08:26 +01:00
Laurent Destailleur	b5d1a34080	Update newpayment.php	2018-11-24 11:08:05 +01:00
Laurent Destailleur	c1efb2d423	Merge pull request #10070 from frederic34/patch-17 ... doc comment accountancycategory class	2018-11-24 11:06:32 +01:00
Laurent Destailleur	333efbeadf	Merge pull request #10061 from andreubisquerra/master ... Cash drawer button	2018-11-24 11:05:55 +01:00
wdammak	5c9d5bb6ad	order by category	2018-11-23 21:30:34 +01:00
wdammak	5c3daf4a6a	order by category	2018-11-23 21:27:22 +01:00
wdammak	064816242a	Order by category	2018-11-23 21:26:10 +01:00
Laurent Destailleur	13e24dc894	Code comment	2018-11-23 15:35:40 +01:00
Laurent Destailleur	5bd9c14929	Update demo data for 8.0 and 9.0	2018-11-23 14:05:45 +01:00
Laurent Destailleur	9f610c2279	Add website template	2018-11-23 12:46:32 +01:00
ptibogxiv	e8ba8814cd	Update newpayment.php	2018-11-23 12:45:37 +01:00
ptibogxiv	6a232a8754	Update newpayment.php	2018-11-23 12:27:24 +01:00
ptibogxiv	1cc6763950	Fix order billed online payment	2018-11-23 11:40:38 +01:00
Laurent Destailleur	ea7c77d788	Trans	2018-11-23 11:09:27 +01:00
Laurent Destailleur	a06b032c23	fix trans	2018-11-23 10:53:04 +01:00
fappels	322ce410d7	Add missing paid field in fetch sql	2018-11-23 09:42:43 +01:00
Frédéric FRANCE	d21abc2dc3	Update accountancycategory.class.php	2018-11-22 23:26:04 +01:00
Frédéric FRANCE	295d082da1	Update accountancycategory.class.php	2018-11-22 22:56:38 +01:00
Frédéric FRANCE	21b429836a	doc comment accountancycategory class	2018-11-22 21:08:03 +01:00
Laurent Destailleur	0a057c8277	Clean var_dump	2018-11-22 20:47:53 +01:00
Laurent Destailleur	fe35e72e83	Fix perf. Make only one request per group for year N-1.	2018-11-22 20:45:50 +01:00
Laurent Destailleur	5727cf2910	Prepare code for performance enhancement	2018-11-22 20:09:27 +01:00
Laurent Destailleur	72fc0226e3	Optimize performance: Remove call for year N, can be done with total of ... each month	2018-11-22 19:45:35 +01:00
Laurent Destailleur	97af22369d	Trans	2018-11-22 13:47:55 +01:00
Laurent Destailleur	3bb7726101	Revert "Fix translation" ... This reverts commit 8de30c12d8.	2018-11-22 13:22:05 +01:00
Laurent Destailleur	8de30c12d8	Fix translation	2018-11-22 13:19:25 +01:00
Laurent Destailleur	0fbf213739	Fix length of field	2018-11-22 13:08:18 +01:00
JC Prieto	54418c168b	New: Update only the multiprices that have been changed ... When a multiprice was changed all level prices were updated at once and history of prices is getting very large.	2018-11-22 12:38:10 +01:00
Laurent Destailleur	1d4c756783	FIX Remote ip detection was wrong with proxy (example: cloudflare)	2018-11-22 11:44:37 +01:00
Thibault Descamps	d63d8088ed	Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_global_search_go_direct_on_card	2018-11-22 11:37:25 +01:00
Thibault Descamps	c2e5a29246	NEW redirect if only one result on global search on card	2018-11-22 11:36:30 +01:00
Laurent Destailleur	784c13d9d0	Fix label of month	2018-11-22 11:14:05 +01:00
Laurent Destailleur	89138bc349	FIX Accounting personalized report when using multicompany	2018-11-22 10:59:39 +01:00
Laurent Destailleur	21e9c02b11	Performance enhancement in Accounting Personalized report	2018-11-22 10:40:15 +01:00
Frédéric FRANCE	491270b27f	try to fix the expensereport pdf	2018-11-21 23:06:52 +01:00
IJ	693a8d6e4a	NEW: Add hidden config 'ADD_UNSPLASH_LOGIN_BACKGROUND' ... - The background image will be refreshed on every login page refresh - Background image is pulled from the popular open source image website Unsplash - If an already saved static background image exists, then this code will override it (but not delete the saved image).	2018-11-21 21:53:29 +00:00
ptibogxiv	fe30eee16e	Fix sql don.class.php	2018-11-21 19:50:55 +01:00
andreubisquerra	463aff4540	Cash drawer button	2018-11-21 16:54:40 +01:00
Laurent Destailleur	5e9abe6aad	Fix getLanguageCodeFromCountryCode	2018-11-21 16:28:36 +01:00
Laurent Destailleur	b6dac7da20	FIX Remote ip detection was wrong with proxy (example: cloudflare)	2018-11-21 15:40:15 +01:00
Laurent Destailleur	93929a652b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-21 15:35:15 +01:00
Laurent Destailleur	084516b885	Fix ip detection of geoip	2018-11-21 15:11:57 +01:00
Frédéric FRANCE	e8cac0df35	correct link and avoid warning in resource list	2018-11-21 14:06:06 +01:00
Thibault Descamps	1cc130e5f6	NEW : conf to change concat desc order	2018-11-21 09:57:44 +01:00
Laurent Destailleur	0ea6f2778b	Fix examples	2018-11-20 22:01:38 +01:00
Laurent Destailleur	6514b51382	Better help	2018-11-20 21:59:05 +01:00
Frédéric FRANCE	730863cb09	reduce complexity of eldylib menu	2018-11-20 21:40:37 +01:00
Laurent Destailleur	c891f6ed10	Disable javascript feature with no javascript	2018-11-20 21:26:22 +01:00
Laurent Destailleur	1ecdaa548c	Remove the no more used and deprecated dol_print_graph function	2018-11-20 20:28:46 +01:00
Laurent Destailleur	966a0b7ec7	Fix message content and language	2018-11-20 20:13:16 +01:00
Laurent Destailleur	07fe7e58d8	Code comment	2018-11-20 19:04:58 +01:00
Laurent Destailleur	61fddadc3f	Complete the fetchAll of modulebuilder + websitepage	2018-11-20 18:29:29 +01:00
Laurent Destailleur	200de22807	Missing image in container	2018-11-20 16:48:34 +01:00
Laurent Destailleur	f455e32bef	FIX Some modules templates were visible when it should not	2018-11-20 16:22:16 +01:00
Laurent Destailleur	12a6709ebe	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-20 15:27:16 +01:00
Laurent Destailleur	4b82538941	Better module position	2018-11-20 14:56:14 +01:00
Laurent Destailleur	7587eedd7c	Merge pull request #10044 from prietojc/patch-1 ... # Fix: Missing lines to search total_ttc	2018-11-20 13:44:08 +01:00
Laurent Destailleur	7e735e222e	Merge pull request #10045 from frederic34/patch-2 ... GETPOSTISSET has only one parameter	2018-11-20 13:43:41 +01:00
Laurent Destailleur	8ecd5ffa3b	FIX Missing button cancel	2018-11-20 13:41:38 +01:00
Laurent Destailleur	be4dc40dfa	Fix standardize date format for payment between customer and supplier	2018-11-20 10:16:54 +01:00
Laurent Destailleur	4845e90d95	Fix update of hours for payment	2018-11-20 10:03:38 +01:00
Laurent Destailleur	4bf5a12f35	Fix trans	2018-11-20 09:56:03 +01:00
Frédéric FRANCE	2e4ec1ed10	Update fournisseur.commande.class.php	2018-11-19 23:56:20 +01:00
Frédéric FRANCE	4e60e48f34	Update CMailFile.class.php	2018-11-19 23:43:58 +01:00
Frédéric FRANCE	2179e2011e	doc cmail class	2018-11-19 23:38:07 +01:00
Frédéric FRANCE	32706f570d	reduce complexity of htmlformmail class	2018-11-19 21:19:39 +01:00
Laurent Destailleur	e020597ba7	Fix deletion for class build with modulebuilder	2018-11-19 21:11:26 +01:00
Frédéric FRANCE	8f17ae8df5	GETPOSTISSET has only one parameter	2018-11-19 20:28:55 +01:00
Laurent Destailleur	62a5869db4	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-19 20:08:14 +01:00
Laurent Destailleur	39621ec686	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/commonobject.class.php	2018-11-19 20:07:51 +01:00
Laurent Destailleur	25ee999d27	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-19 20:05:32 +01:00
Laurent Destailleur	20dbbaf5cc	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-19 20:05:04 +01:00
Laurent Destailleur	fb6aa01207	FIX #10030 better german chart	2018-11-19 20:04:31 +01:00
JC Prieto	deff4ca4a0	Update list.php ... Missing the following lines to search total_ttc	2018-11-19 20:03:36 +01:00
Frédéric FRANCE	8f7e90da8c	clean clean	2018-11-19 19:08:14 +01:00
Laurent Destailleur	839428d545	Missing trans	2018-11-19 19:02:00 +01:00
Laurent Destailleur	8191df4857	Merge pull request #9962 from atm-john/fix_extrafield_view ... FIX hidden extrafield	2018-11-19 18:37:18 +01:00
Laurent Destailleur	929635d468	Merge pull request #10026 from OPEN-DSI/fix-contact-agenda-filter ... Fix Contact Agenda events filter when no Third Party	2018-11-19 18:35:55 +01:00
Laurent Destailleur	471f41577c	Merge pull request #10040 from defrance/patch-124 ... Add societe extrafields on proposal export	2018-11-19 18:33:41 +01:00
Laurent Destailleur	8535844737	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-11-19 18:27:00 +01:00
Laurent Destailleur	1931fd33eb	Merge pull request #10041 from atm-ph/fix_8.0_optional_param ... Fix new params has been added not optional	2018-11-19 18:26:21 +01:00
Laurent Destailleur	e2269796e2	Merge branch 'develop' into swiftmailer	2018-11-19 18:23:55 +01:00
Laurent Destailleur	bd8856b988	Merge pull request #10033 from frederic34/patch-9 ... Update CMailFile.class.php	2018-11-19 18:20:20 +01:00
Laurent Destailleur	7a3f088fcb	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-11-19 18:19:11 +01:00
Laurent Destailleur	77bc1c4313	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/core/actions_massactions.inc.php	2018-11-19 18:18:43 +01:00
Laurent Destailleur	c0dac69116	Merge pull request #10031 from aspangaro/9.0_style ... Fix Page Salaries stats - Look & feel v9	2018-11-19 18:14:35 +01:00
Laurent Destailleur	4bedeabc5b	FIX #10036	2018-11-19 18:02:29 +01:00
François J	37f3b8bbde	Update @since version to 9.0	2018-11-19 17:51:00 +01:00
Laurent Destailleur	1b09179df7	Merge pull request #10035 from frederic34/patch-15 ... typo	2018-11-19 17:44:20 +01:00
Laurent Destailleur	828f79bbd5	Merge pull request #10023 from hregis/develop_bug2 ... FIX more simple	2018-11-19 17:44:05 +01:00
François J	6aaf0f4655	Add afterSelectOptions hook & selectcontacts context	2018-11-19 17:40:16 +01:00
gauthier	ecdfa5219b	FIX : We want to be able to send PDF of paid invoices	2018-11-19 17:31:45 +01:00
Laurent Destailleur	8d4db1d085	Fix phpcs	2018-11-19 16:35:37 +01:00
Laurent Destailleur	77ed591648	Fix phpcs	2018-11-19 16:05:27 +01:00
Laurent Destailleur	2f87ee6640	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-19 15:56:38 +01:00
Laurent Destailleur	2d09008610	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-19 15:55:59 +01:00
Laurent Destailleur	f85ab8d0a6	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/comm/propal/card.php	2018-11-19 15:55:41 +01:00
Laurent Destailleur	8a5add6a98	Fix phpcs	2018-11-19 15:53:09 +01:00
Laurent Destailleur	50e20b2ac0	Fix phpcs	2018-11-19 15:52:46 +01:00
Laurent Destailleur	a3398f1a8d	Sync transifex	2018-11-19 15:49:58 +01:00
atm-ph	129034ba76	Fix new params has been added not optional	2018-11-19 15:46:30 +01:00
Laurent Destailleur	ade0363224	Module status	2018-11-19 15:46:20 +01:00
Laurent Destailleur	2947dcfc8d	Sanitize message	2018-11-19 15:36:12 +01:00
Laurent Destailleur	5f93315097	Clean code	2018-11-19 15:14:46 +01:00
Laurent Destailleur	0886928a64	FIX Link between action and project must use field not the link table	2018-11-19 14:38:30 +01:00
Laurent Destailleur	1e1ccd4c88	Fix pagination in action/event list	2018-11-19 14:25:34 +01:00
BENKE Charlene	92562ad89f	Add societe extrafields on export	2018-11-19 12:17:41 +01:00
florian HENRY	dc2f1e9812	fix list agenda extrafield visibility	2018-11-19 11:25:48 +01:00
Laurent Destailleur	824b1924e2	Fix loading of cronjob	2018-11-19 10:33:42 +01:00
Alexandre SPANGARO	cf0c4a5ce0	Add in public area	2018-11-18 22:03:32 +01:00
Alexandre SPANGARO	2d55666a0b	NEW Add gender in member card	2018-11-18 21:50:58 +01:00
Regis Houssin	7cba680f38	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2018-11-18 17:07:03 +01:00
Laurent Destailleur	2480a8dc2a	Ignore	2018-11-18 15:57:20 +01:00
Laurent Destailleur	22b2af6911	Exclude dir	2018-11-18 15:46:37 +01:00
Laurent Destailleur	a179d45afd	Remove deprecated translation keys	2018-11-17 23:40:10 +01:00
Laurent Destailleur	1cce95cb23	Trans	2018-11-17 23:35:49 +01:00
Laurent Destailleur	13d00b2eb1	Sync transifex	2018-11-17 23:14:12 +01:00
Laurent Destailleur	7f33403d43	Fix translation	2018-11-17 22:55:13 +01:00
Frédéric FRANCE	0ba388de5d	typo	2018-11-17 18:03:59 +01:00
Frédéric FRANCE	30b1db34cd	Update CMailFile.class.php	2018-11-17 11:33:01 +01:00
Alexandre SPANGARO	4e39065e29	Fix Page Salaries stats - Look & feel v9	2018-11-17 07:37:32 +01:00
Laurent Destailleur	a2c9fefee0	Fix do not show tool to check european vat if country is not in EEC	2018-11-17 00:40:39 +01:00
Laurent Destailleur	6b8a3094f0	Fix missing some keys in substitution arrays	2018-11-17 00:14:23 +01:00
Frédéric FRANCE	35142ac2fb	wip	2018-11-16 17:58:14 +01:00
Laurent Destailleur	028be21070	Debug	2018-11-16 16:55:53 +01:00
Laurent Destailleur	5d596fe584	Fix trackid must contains an id of instance	2018-11-16 16:43:13 +01:00
Laurent Destailleur	3b193a8a7b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-16 14:13:18 +01:00
Laurent Destailleur	f32706259a	Sync transifex	2018-11-16 14:13:00 +01:00
François J	a5777d30e1	Fix Contact Agenda events filter when no Third Party ... Handle case where the contact is not linked to any third party.	2018-11-16 10:09:25 +01:00
Frédéric FRANCE	ce6b7adaa0	Merge remote-tracking branch 'upstream/develop' into actionrefused	2018-11-15 22:15:45 +01:00
Frédéric FRANCE	12dcda7e02	Merge remote-tracking branch 'upstream/develop' into fieldlabel	2018-11-15 22:01:36 +01:00
Frédéric FRANCE	532ce34c53	i put the sword under the carpet	2018-11-15 21:36:20 +01:00
Frédéric FRANCE	7c241620c0	replace random_bytes	2018-11-15 21:20:09 +01:00
Frédéric FRANCE	482c6efdd9	replace php > 5.4 code	2018-11-15 20:35:40 +01:00
Frédéric FRANCE	caa080f103	replace php > 5.4 code	2018-11-15 20:32:51 +01:00
Laurent Destailleur	6d640ab83c	Fix feature to drag and drop rows of table (not generic)	2018-11-15 19:58:06 +01:00
Regis Houssin	2350908d4e	FIX change getEntity doc and changelog	2018-11-15 19:00:14 +01:00
Regis Houssin	a0709895c5	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2018-11-15 18:55:48 +01:00
Regis Houssin	ffc9b02322	FIX missing one column	2018-11-15 18:28:12 +01:00
Regis Houssin	38b4b719f0	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug2	2018-11-15 18:27:50 +01:00
Regis Houssin	03acd7a40c	FIX travis error again	2018-11-15 18:24:32 +01:00
Laurent Destailleur	e58dd3c0b1	Merge pull request #10024 from hregis/develop_bug ... FIX travis errors	2018-11-15 18:21:25 +01:00
Laurent Destailleur	7d5c9959bc	Close #9978 ... Better way to address the feature. Work in most cases, need less code and less sql access.	2018-11-15 18:20:38 +01:00
Regis Houssin	531b6e8d2b	FIX travis errors	2018-11-15 18:13:07 +01:00
Laurent Destailleur	103dfe2aa7	FIX go back to create form if error	2018-11-15 17:55:27 +01:00
Regis Houssin	2d2e836965	FIX more simple	2018-11-15 17:45:33 +01:00
Laurent Destailleur	b51004e809	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-15 17:34:36 +01:00
Laurent Destailleur	2d6f7f926c	FIX xss injection on user address	2018-11-15 17:34:11 +01:00
Regis Houssin	aaa9a4f47c	FIX use getEntity('invoice') instead getEntity('facture')	2018-11-15 17:27:49 +01:00
Laurent Destailleur	e1407c8289	Merge pull request #10012 from hregis/develop_mc ... FIX compatibility between proposal sharing and proposalnumber sharing	2018-11-15 17:19:28 +01:00
Laurent Destailleur	6297e03ea9	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-15 17:16:12 +01:00
Laurent Destailleur	4fa694569e	Merge pull request #10018 from Tetras-Libre/develop ... Fix issue #9956 User can edit some of their data without permissons	2018-11-15 16:56:57 +01:00
Laurent Destailleur	8a97ba4ba9	Update card.php	2018-11-15 16:56:12 +01:00
Laurent Destailleur	ff0a5d9fe1	Merge pull request #10016 from WSoptics/wsoptics-8.0 ... FIX: sql errors	2018-11-15 16:47:52 +01:00
Laurent Destailleur	6ffd63c965	Update projectstats.class.php	2018-11-15 16:47:40 +01:00
Laurent Destailleur	f2bbb54b8f	Merge pull request #10011 from atm-gauthier/7.0_fix_search_categ_product_on_supplierorderlist ... FIX : filter on product category doesn't work	2018-11-15 16:44:40 +01:00
Laurent Destailleur	f3228dc4f8	Merge pull request #10010 from atm-john/Fix_cat_photo_upload ... Fix event message on upload category picture fail	2018-11-15 16:43:59 +01:00
Laurent Destailleur	d20bb41cde	Merge pull request #10017 from hregis/8.0_bug ... FIX avoid error if $object->fk_account =< 0 for getNomUrl	2018-11-15 16:43:00 +01:00
Laurent Destailleur	b0d1174600	Merge pull request #10020 from mwelters/develop ... for Denmark: forme_jurisdisque additions	2018-11-15 16:39:32 +01:00
Laurent Destailleur	8bfcbc8f9d	Merge pull request #10015 from frederic34/patch-9 ... doc bookkeeping class	2018-11-15 16:28:42 +01:00
Laurent Destailleur	f2fba05475	Merge branch 'develop' into new_branch_13_11_2018	2018-11-15 16:23:54 +01:00
Laurent Destailleur	c04fcf170b	Work on emailcollector	2018-11-15 16:23:07 +01:00
Laurent Destailleur	85cdc44105	Several fixes in project creation, cache of dolGetIfFromCode, ...	2018-11-15 13:39:12 +01:00
markus	ac0f46f9e5	for Denmark: forme_jurisdisque additions	2018-11-15 11:10:54 +01:00
Laurent Destailleur	3ca45e0e40	Fix double dot in sql filename	2018-11-15 10:59:55 +01:00
Regis Houssin	6f90516f57	FIX check write permission for multicurrency	2018-11-15 09:40:08 +01:00
Frédéric FRANCE	92cda2a75c	fix cant use method return value	2018-11-14 23:29:24 +01:00
Frédéric FRANCE	b13ad8170f	correctly check intl extension	2018-11-14 22:42:09 +01:00
Frédéric FRANCE	1c15d249b3	replace specific php7 code	2018-11-14 22:05:21 +01:00
Laurent Destailleur	e94b545cb6	Fix field not required	2018-11-14 18:38:09 +01:00
David Beniamine	01947288fb	Fix issue #9956 User can edit some of their data without permissons	2018-11-14 18:29:15 +01:00
Regis Houssin	bcc83408e0	FIX avoid error if $object->fk_account =< 0 for getNomUrl	2018-11-14 18:10:41 +01:00
Regis Houssin	976094043b	FIX missing GETPOST('entity')	2018-11-14 17:34:27 +01:00
Regis Houssin	0907a6d611	FIX wrong object name (travis error)	2018-11-14 16:55:14 +01:00
Regis Houssin	0592e8a31c	FIX config is override by multicompany module	2018-11-14 16:44:10 +01:00
Regis Houssin	874e27ef84	FIX multicompany override constants of current entity	2018-11-14 15:37:10 +01:00
Regis Houssin	93a1e941a4	FIX new method: override constants of current entity	2018-11-14 15:34:39 +01:00
Regis Houssin	2bc25fc008	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2018-11-14 15:24:41 +01:00
Regis Houssin	9ff4b31843	FIX compatibility with invoice sharing and invoice number sharing	2018-11-14 15:24:22 +01:00
Regis Houssin	3294fada3d	FIX working on invoice sharing (multicompany)	2018-11-14 14:59:36 +01:00
Laurent Destailleur	1f6ccd4a66	Fix permission to edit websites	2018-11-14 13:58:00 +01:00
Laurent Destailleur	a7989eb893	Fix menu	2018-11-14 13:55:10 +01:00
Laurent Destailleur	df2aa2e2f6	Fix column balance	2018-11-14 13:52:43 +01:00
Laurent Destailleur	ba22ae45e7	Fix column balance	2018-11-14 13:45:20 +01:00
Laurent Destailleur	0201939ebe	Fix column balance	2018-11-14 13:43:39 +01:00
Laurent Destailleur	7aa042172e	Fix sql error	2018-11-14 13:06:40 +01:00
Frédéric FRANCE	4909e3afc4	doc bookkeeping class	2018-11-14 08:28:20 +01:00
Frédéric FRANCE	731d19a29b	add tooltip to butActionRefused	2018-11-13 21:40:17 +01:00
Regis Houssin	04edcaa89c	FIX compatibility between proposal sharing and proposalnumber sharing	2018-11-13 20:20:46 +01:00
gauthier	85dd0ec2dd	FIX : filter on product category doesn't work	2018-11-13 15:24:53 +01:00
John BOTELLA	c6cf748ba7	Fix envent message on upload category picture	2018-11-13 14:44:10 +01:00
Laurent Destailleur	77582b2a41	FIX the autofocus feature	2018-11-13 11:36:57 +01:00
John BOTELLA	500bb7bc96	best conditions testing	2018-11-13 10:20:34 +01:00
Philippe GRAND	2ed060a070	fix: Invalid argument supplied for foreach()	2018-11-13 10:07:04 +01:00
Philippe GRAND	35c43683b6	fix Erreur DB_ERROR_SYNTAX	2018-11-13 09:45:47 +01:00
Laurent Destailleur	723654efea	Fix phpcs	2018-11-12 17:15:03 +01:00
Laurent Destailleur	628918f863	Remove var_dump	2018-11-12 16:43:33 +01:00
Tobias Elbert	fceaae7a8d	fixed sql query error	2018-11-12 16:22:42 +01:00
Tobias Elbert	ceae6ac376	fixed sql query error	2018-11-12 16:21:20 +01:00
gauthier	f404cae546	FIX : Same on customer card	2018-11-12 16:04:42 +01:00
gauthier	66ea8bbe87	FIX : fourn payment modes musn't be available on customer docs	2018-11-12 15:58:41 +01:00
Laurent Destailleur	01e7b5747d	FIX user param is null not 0 when not defined ... FIX properties email_xx were not set	2018-11-12 15:27:59 +01:00
Laurent Destailleur	5a7cb95b72	FIX filter on entity must be done as soon as we don't search on rowid.	2018-11-12 14:49:08 +01:00
François J	10dd5652ee	Add SELECT DISTINCT to show_actions_done() SQL request	2018-11-12 12:34:25 +01:00
François J	9a6a3d8df4	Join llx_actioncomm_resources only if we have a contact object.	2018-11-12 12:20:07 +01:00
tarrsalah	5eb897e049	FIX sql query performance on list_qualified_avoir_supplier_invoices.	2018-11-12 12:11:40 +01:00
Laurent Destailleur	84983140b6	Merge pull request #9896 from hregis/develop_email ... FIX change my deprecated email	2018-11-11 17:35:35 +01:00
Laurent Destailleur	ca3510e889	Merge pull request #9994 from ptibogxiv/patch-91 ... Fix Invalid argument supplied for foreach()	2018-11-11 17:30:06 +01:00
Laurent Destailleur	cda88f4df9	Merge pull request #9993 from ptibogxiv/patch-90 ... Fix Invalid argument supplied for foreach()	2018-11-11 17:29:32 +01:00
Laurent Destailleur	4f7d3e794a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-11 17:28:29 +01:00
Laurent Destailleur	f022be3a47	FIX #9992	2018-11-11 17:28:17 +01:00
Laurent Destailleur	65d8f59321	Merge pull request #9992 from delcroip/patch-18 ... to support proposal_supplier insert	2018-11-11 17:27:23 +01:00
Laurent Destailleur	2985d9cfbf	Update 8.0.0-9.0.0.sql	2018-11-11 17:27:16 +01:00
Laurent Destailleur	f39b99b153	Merge pull request #9933 from ptibogxiv/patch-83 ... Update Stripe Version API	2018-11-11 17:25:49 +01:00
Laurent Destailleur	35419fa206	Dolibarize code	2018-11-11 15:06:08 +01:00
Laurent Destailleur	0b57faa7b4	Fix help	2018-11-11 14:42:11 +01:00
Laurent Destailleur	de259e9db6	Code comment	2018-11-11 14:36:35 +01:00
Laurent Destailleur	ad7ae76cd3	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-10 15:51:49 +01:00
patrick Delcroix	fa9ecd9f97	clean: align with upstream	2018-11-10 15:46:51 +01:00
patrick Delcroix	e9d3db084a	new: link to the compta-files.php in the accountancy left menu	2018-11-10 15:35:56 +01:00
ptibogxiv	80782a366e	Fix Invalid argument supplied for foreach()	2018-11-10 15:04:38 +01:00
Laurent Destailleur	6591cdba75	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-10 15:03:34 +01:00
ptibogxiv	5c96689c87	Fix Invalid argument supplied for foreach()	2018-11-10 15:02:50 +01:00
delcroix Patrick	52f35d8038	to support proposal_supplier insert ... proposal_supplier has 17 char when the elementtype column can take only 16 char	2018-11-10 14:59:46 +01:00
delcroix Patrick	4b0d3ad6c6	Update llx_projet_task_time.sql	2018-11-10 14:31:28 +01:00
delcroix Patrick	34787dc1d7	Update 5.0.0-6.0.0.sql	2018-11-10 14:31:27 +01:00
delcroip	e0bae07f97	NEW:Invoice creation from task Time	2018-11-10 14:31:26 +01:00
Laurent Destailleur	ed3a333436	Fix phpcs	2018-11-10 13:11:18 +01:00
Laurent Destailleur	776d5e6fc6	Merge pull request #9988 from frederic34/patch-15 ... The variable $i seems to be never defined.	2018-11-10 12:20:09 +01:00
Laurent Destailleur	5ec602cafa	Merge pull request #9983 from hregis/8.0_bug ... FIX missing field "visible"	2018-11-10 12:19:35 +01:00
Laurent Destailleur	2946ca60cf	Merge pull request #9989 from frederic34/patch-16 ... Update actions_ticket.class.php	2018-11-10 12:18:37 +01:00
Laurent Destailleur	bd78ea1ccf	Merge pull request #9987 from frederic34/dkim ... add admin dkim translation	2018-11-10 12:16:43 +01:00
Laurent Destailleur	bae1ff67a4	Merge pull request #9986 from frederic34/patch-9 ... remove warning	2018-11-10 12:16:10 +01:00
ptibogxiv	20a3dd86cd	2018-11-08 ... no change for dolibarr but better for integration and development	2018-11-10 11:07:01 +01:00
Frédéric FRANCE	20acf440a3	Update api_products.class.php	2018-11-10 07:55:01 +01:00
Frédéric FRANCE	c2ee9ba9db	Update actions_ticket.class.php	2018-11-10 07:38:55 +01:00
Frédéric FRANCE	2514cf4a96	Update actions_ticket.class.php	2018-11-10 07:32:22 +01:00
Frédéric FRANCE	b271e1a3b0	The variable $i seems to be never defined.	2018-11-10 07:27:20 +01:00
Laurent Destailleur	e86e3ec7ac	Work on email collector	2018-11-09 19:30:44 +01:00
Laurent Destailleur	f1287578f3	Work on emailcollector	2018-11-09 18:18:17 +01:00
Frédéric FRANCE	09efde4901	Merge remote-tracking branch 'upstream/develop' into fieldlabel	2018-11-09 18:13:59 +01:00
Frédéric FRANCE	172468587d	Update mymodulewidget1.php	2018-11-09 18:13:13 +01:00
Frédéric FRANCE	6cd27d8c80	add admin dkim translation	2018-11-09 18:08:06 +01:00
Regis Houssin	89389baeac	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email	2018-11-09 15:37:29 +01:00
Frédéric FRANCE	1fd398234f	remove warning	2018-11-09 15:29:49 +01:00
Laurent Destailleur	773e2da4cc	Fix example of number for holiday	2018-11-09 11:41:27 +01:00
Regis Houssin	ee06f36f4c	FIX missing field "visible"	2018-11-09 11:36:20 +01:00
Regis Houssin	5d1d77a966	FIX missing action "edit" for the hook	2018-11-09 10:32:08 +01:00
Laurent Destailleur	f1193ad3dd	FIX: Missing date creation and modification of supplier price	2018-11-09 10:29:22 +01:00
François J	7c2256a4a7	Fix X-Dolibarr-TRACKID header: set to 'conXXX' where XXX is contact ID.	2018-11-09 09:33:27 +01:00
Laurent Destailleur	4946de9533	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: dev/setup/codesniffer/ruleset.xml	2018-11-09 01:32:47 +01:00
Laurent Destailleur	9d15f83f4c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-08 20:19:45 +01:00
Laurent Destailleur	3e844db74f	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/fichinter/stats/index.php	2018-11-08 20:19:28 +01:00
Laurent Destailleur	8a89da25c6	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/margin/tabs/thirdpartyMargins.php	2018-11-08 20:18:13 +01:00
Laurent Destailleur	400b48bd9b	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-11-08 20:14:59 +01:00
Laurent Destailleur	9012f6ecc5	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-11-08 20:14:40 +01:00
Laurent Destailleur	1b8649be6f	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-08 20:14:02 +01:00
Laurent Destailleur	d6bd325f70	Merge pull request #9980 from atm-john/fix_supplier_order_list_socid ... FIX supplier order list keep socid	2018-11-08 20:13:52 +01:00
Laurent Destailleur	b26867c027	Merge pull request #9977 from ptibogxiv/patch-89 ... FIX API for document download	2018-11-08 20:09:08 +01:00
Laurent Destailleur	4ced94f5fd	Merge pull request #9974 from frederic34/previewimage ... can click on image to preview in doc list	2018-11-08 20:06:38 +01:00
Laurent Destailleur	9a31a61c9d	FIX #9971	2018-11-08 20:05:01 +01:00
Laurent Destailleur	f919e6ddb0	Merge pull request #9971 from atm-gauthier/FIX_langs_projet ... FIX : OppStatusShort doesn't exists	2018-11-08 20:00:49 +01:00
Laurent Destailleur	76ac3bd457	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-08 19:57:42 +01:00
Laurent Destailleur	be788e6167	FIX responsive	2018-11-08 19:57:31 +01:00
Laurent Destailleur	b45ead7038	Merge pull request #9970 from OPEN-DSI/search-contact-by-town ... New Search Contact by Town	2018-11-08 19:55:51 +01:00
Laurent Destailleur	50bd8bc4ce	Merge pull request #9969 from grandoc/new_branch_07_11_2018 ... fix : missing translation	2018-11-08 19:55:25 +01:00
Laurent Destailleur	7430a35533	Merge pull request #9966 from madx666/contrib ... Fix public ticket website	2018-11-08 19:54:36 +01:00
Laurent Destailleur	e84e7f02c8	Merge pull request #9963 from atm-john/fix_marge_sign ... FIX marge sign	2018-11-08 19:37:52 +01:00
Laurent Destailleur	01baddb096	Merge pull request #9959 from hregis/8.0_bug ... FIX export only prices of the current entity !	2018-11-08 19:26:09 +01:00
Laurent Destailleur	d1aabf9566	Merge pull request #9976 from atm-john/fix_warning ... FIX Warning: count()	2018-11-08 19:25:32 +01:00
Laurent Destailleur	b6ffca01d2	Merge pull request #9973 from AXeL-dev/patch-2 ... remove useless line of code	2018-11-08 19:25:00 +01:00
Laurent Destailleur	ed76fef860	Merge pull request #9954 from LaurentBouquet/feature/product-search-barcode ... NEW Add product search from barcode via REST api.	2018-11-08 19:18:41 +01:00
Laurent Destailleur	5e705ae209	Merge pull request #9950 from grandoc/new_branch_04_11_2018 ... Clean and update code	2018-11-08 19:16:25 +01:00
Laurent Destailleur	78778e4c58	Merge pull request #9948 from frederic34/patch-9 ... FIX mode is only customer in stats fichinter	2018-11-08 19:16:00 +01:00
Laurent Destailleur	a50eb014ee	Merge pull request #9946 from ptibogxiv/patch-88 ... Fix with new stripe payment function	2018-11-08 19:13:38 +01:00
Laurent Destailleur	588de2cc86	Fix filter on entity on project	2018-11-08 18:45:02 +01:00
Laurent Destailleur	27dcf18637	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-08 18:43:31 +01:00
ptibogxiv	cf688a894b	Update api_documents.class.php	2018-11-08 17:20:12 +01:00
Laurent Destailleur	e92a63ba73	FIX If we change customer/supplier rule we can't edit old thirdparty.	2018-11-08 17:15:35 +01:00
Laurent BOUQUET	320e7adef7	Fix blank lines and whitespace at end of lines	2018-11-08 17:09:54 +01:00
Laurent BOUQUET	b03a91213f	Merge branch 'develop' into feature/product-search-barcode	2018-11-08 16:57:49 +01:00
Laurent Destailleur	6401a7ab06	Fix css	2018-11-08 16:03:10 +01:00
John BOTELLA	98548337ae	FIX supplier order list keep socid	2018-11-08 15:38:25 +01:00
ptibogxiv	8727435216	Update API for download ... more infos for easiest & better use of the generated file by API	2018-11-08 13:58:37 +01:00
Frédéric FRANCE	8bb1545ed0	Update index.php	2018-11-08 12:16:05 +01:00
Frédéric FRANCE	670eed1e68	Update index.php	2018-11-08 12:13:07 +01:00
John BOTELLA	7c4dad2728	FIX Warning: count()	2018-11-08 12:12:45 +01:00
Laurent Destailleur	224d37cfeb	Add bootstrap-iso class	2018-11-08 12:12:08 +01:00
Laurent Destailleur	c55f83b0b7	Fix multicompany filter missing	2018-11-08 11:25:29 +01:00
Laurent Destailleur	22170ac1c1	FIX Crop of large files was selecting wrong image area.	2018-11-08 10:45:39 +01:00
Laurent Destailleur	5bbf7e8f1d	Fix look and feel v8	2018-11-08 10:21:43 +01:00
Laurent Destailleur	c74ad61365	Fix look and feel v8	2018-11-08 10:04:25 +01:00
Laurent Destailleur	976516a796	Fix look and feel v8	2018-11-08 09:51:46 +01:00
Frédéric FRANCE	3ba3a47f20	close window	2018-11-07 22:04:55 +01:00
Frédéric FRANCE	df224e4b54	can click on image to preview in doc list	2018-11-07 21:51:05 +01:00
AXeL-dev	9dbb222a0a	remove useless line of code	2018-11-07 18:27:41 +01:00
Laurent Destailleur	193b153fbf	Work on email collector	2018-11-07 18:02:08 +01:00
François J	121297b5bd	SQL Join actioncomm_resources	2018-11-07 17:10:51 +01:00
François J	aea01b3208	NEW Work with new table actioncomm_resources and multiple contact affectation	2018-11-07 17:04:18 +01:00
Laurent Destailleur	6ba78b2bb3	Work on email collector	2018-11-07 16:33:06 +01:00
gauthier	70826c3191	FIX : same on lines	2018-11-07 16:32:23 +01:00
gauthier	05a679a10c	FIX : OppStatusShort doesn't exists	2018-11-07 16:26:25 +01:00
François J	afdefa56bd	New Search Contact by Town ... Adding the missing SQL condition to filter contact list by user requested town	2018-11-07 15:34:07 +01:00
Philippe GRAND	f6394e4210	fix : error 500	2018-11-07 15:07:57 +01:00
Philippe GRAND	671b4dc227	fix : missing translation	2018-11-07 14:01:49 +01:00
Laurent Destailleur	46db246273	Look and feel v9: Autofocus on create forms	2018-11-07 13:04:43 +01:00
Laurent Destailleur	66ffcf287a	Fix filter on extrafields	2018-11-07 12:49:17 +01:00
Laurent Destailleur	9a0b5fb599	Fix extrafields	2018-11-07 12:25:22 +01:00
Laurent Destailleur	c5231112c5	Fix regression with old canvas	2018-11-07 12:22:12 +01:00
John BOTELLA	abb6b41f91	Fix screen size fall	2018-11-07 11:25:13 +01:00
John BOTELLA	9d780a1722	Fix sign	2018-11-07 10:11:29 +01:00
madx666	2ff69bb3fc	Fix viewTicketMessages for ticket module	2018-11-07 10:11:28 +01:00
madx666	c76c2e0d3e	Fix newMessagePublic for ticket module	2018-11-07 10:08:38 +01:00
John BOTELLA	4f7be36249	fix extrafield hidden	2018-11-07 09:14:29 +01:00
Laurent Destailleur	c1cf4fbb95	Fix phpcs	2018-11-06 20:29:58 +01:00
Laurent Destailleur	7dd941dd51	Fix bad fix	2018-11-06 19:51:16 +01:00
Laurent Destailleur	c4db549f94	Work on emailcollector	2018-11-06 19:49:52 +01:00
Laurent Destailleur	a976dd74db	Fix Report error if file size too large	2018-11-06 18:44:51 +01:00
Laurent Destailleur	e0070bd348	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/expedition/doc/pdf_rouget.modules.php htdocs/filefunc.inc.php	2018-11-06 18:30:57 +01:00
Regis Houssin	d32fd9fda5	FIX export only prices of the current entity !	2018-11-06 18:08:29 +01:00
Laurent Destailleur	7e33af6677	Fix max size	2018-11-06 17:40:59 +01:00
François J	2dd69c3735	Hide buttons when action is presend email	2018-11-06 16:51:48 +01:00
Laurent Destailleur	1e801c7c8a	Fix css	2018-11-06 16:50:31 +01:00
François J	29c71b31fe	[New] Add Presend form & Actions to send emails to Contact card ... Add ability to send email to contact from the Contact card. Functionality was copied and adapted from the Third Party card.	2018-11-06 16:40:39 +01:00
François J	f9a8b240ac	Add PredefinedMailContentContact lang string	2018-11-06 15:05:03 +01:00
Laurent Bouquet	f05b67909b	NEW : Add product search from barcode via REST api	2018-11-06 12:13:16 +01:00
Laurent Destailleur	055a55b900	NEW Add SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME and ... SHIPPING_PDF_HIDE_QTYTOSHIP	2018-11-06 10:03:12 +01:00
Laurent Destailleur	52aa860008	Code comment	2018-11-06 09:39:22 +01:00
Laurent Bouquet	cb10da4d41	[Core] Add product search from barcode via REST api	2018-11-05 23:06:19 +01:00
Laurent Bouquet	0f43521274	Fix syntax error in 'htdocs\accountancy\admin\export.php' : Delete 'aZ09' text in line 45	2018-11-05 22:52:57 +01:00
Laurent Destailleur	15dd2b3e35	Work on email collector	2018-11-05 21:19:09 +01:00
Laurent Destailleur	4a25317f10	Fix security on GETPOST('action'). Param must be sanitized.	2018-11-05 20:29:07 +01:00
Laurent Destailleur	763f3cd518	Debug modulebuilder	2018-11-05 18:10:38 +01:00
Laurent Destailleur	c0f4ec5a3e	FIX sanitize param $action	2018-11-05 17:53:31 +01:00
Laurent Destailleur	dd70f1bf08	Debug emailcollector	2018-11-05 16:59:40 +01:00
Laurent Destailleur	eb9defcf1d	Debug emailcollector	2018-11-05 16:42:29 +01:00
Laurent Destailleur	52d4426e87	Debug new modules	2018-11-05 16:38:07 +01:00
Laurent Destailleur	d65bf1fbc7	Fix emailcollector	2018-11-05 15:31:41 +01:00
Laurent Destailleur	f0305a7beb	Prepare 8.0.4	2018-11-05 13:50:12 +01:00
Laurent Destailleur	9556a6dfb9	Remove warning	2018-11-05 12:31:35 +01:00
Laurent Destailleur	c988e2e681	Fix phpcs	2018-11-05 10:44:37 +01:00
Laurent Destailleur	4c591daab1	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/core/class/html.formprojet.class.php	2018-11-05 10:39:22 +01:00
Laurent Destailleur	90729c03c4	Fix dependencies of new modules	2018-11-05 10:28:44 +01:00
Laurent Destailleur	56a70ab4e5	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-11-05 10:23:15 +01:00
Laurent Destailleur	693cf72fca	Merge pull request #9920 from ATM-Marc/FIX_6.0_task_activity_access ... FIX: task time screen: bad task assignments	2018-11-05 10:21:28 +01:00
Laurent Destailleur	01d7b1e96a	Fix readme detection	2018-11-05 10:15:22 +01:00
Laurent Destailleur	0c7f33e1ba	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-05 09:58:19 +01:00
Laurent Destailleur	2900947019	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-05 09:56:57 +01:00
Laurent Destailleur	e1e0001fda	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-11-05 09:56:00 +01:00
Laurent Destailleur	a9bbb82e98	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-05 09:55:12 +01:00
Laurent Destailleur	bf2c521988	Fix warning	2018-11-05 09:55:00 +01:00
Laurent Destailleur	1afdf7a961	Merge pull request #9947 from bafbes/abb80042 ... New : help picto for fields in creation	2018-11-05 09:54:42 +01:00
Laurent Destailleur	7c3cb7d73c	Update commonfields_add.tpl.php	2018-11-05 09:54:11 +01:00
Laurent Destailleur	ccf6554f76	Merge pull request #9941 from ptibogxiv/patch-87 ... Fix various fix cmail, payout, const, connect	2018-11-05 09:38:41 +01:00
Laurent Destailleur	6fd76f5ffb	Merge pull request #9939 from ptibogxiv/patch-86 ... Fix ext_payment_site	2018-11-05 09:37:45 +01:00
Laurent Destailleur	6b89bc4ecc	Merge pull request #9937 from aspangaro/9.0_FEC ... Debug asset module	2018-11-05 09:36:42 +01:00
Laurent Destailleur	8b373fb7a3	Merge pull request #9935 from atm-maxime/fix_socdelete_unlink_parent ... Fix parent link was not removed on societe deletion #9106	2018-11-05 09:35:41 +01:00
Laurent Destailleur	ce25c6644f	Merge pull request #9952 from andreubisquerra/master ... No posibility to validate if invoice not exist	2018-11-05 09:27:12 +01:00
Laurent Destailleur	98a3af620b	FIX #9934	2018-11-05 09:26:23 +01:00
Laurent Destailleur	4e0dbc1826	Merge pull request #9932 from grandoc/new_branch_01_11_2018 ... complete comment	2018-11-05 09:20:00 +01:00
Laurent Destailleur	58b7201529	Merge pull request #9931 from aspangaro/9.0_accountancy ... Fix Specific finename for FEC export only available on general ledger export	2018-11-05 09:19:42 +01:00
Laurent Destailleur	234c35e940	Merge pull request #9930 from frederic34/fixphpcs ... fix phpcs	2018-11-05 09:18:34 +01:00
Laurent Destailleur	d130e79384	Merge pull request #9936 from ptibogxiv/patch-84 ... Fix payout	2018-11-05 09:17:18 +01:00
andreubisquerra	86b98db2a2	No posibility to validate if invoice not exist	2018-11-04 20:36:23 +01:00
Philippe GRAND	eb49558600	Clean and update code	2018-11-04 12:09:16 +01:00
Frédéric FRANCE	488ac8c8f0	Update index.php	2018-11-03 23:44:25 +01:00
Laurent Destailleur	90d3b80efb	NEW Add email in event histor for reminder email of expired subsription	2018-11-03 22:53:55 +01:00
Frédéric FRANCE	c01113e28b	typo	2018-11-03 22:49:30 +01:00
Laurent Destailleur	f4346c1469	Fix css	2018-11-03 19:24:28 +01:00
Laurent Destailleur	67fbb3dbb6	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/core/class/notify.class.php htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php	2018-11-03 19:15:52 +01:00
Laurent Destailleur	c4bf0f0e03	CSS Flex	2018-11-03 18:57:18 +01:00
Frédéric FRANCE	d6b909a280	Update index.php	2018-11-03 18:26:11 +01:00
Frédéric FRANCE	8ab53012b7	mode is only customer in stats fichinter	2018-11-03 18:20:36 +01:00
Laurent Destailleur	68ec172798	Fix setup to enable reminder b email	2018-11-03 12:37:52 +01:00
Laurent Destailleur	7e55701774	2 remind of subscription expired by default	2018-11-03 11:41:45 +01:00
Laurent Destailleur	64b5e432c2	2 remind of expired subscription by default	2018-11-03 11:40:43 +01:00
Laurent Destailleur	0229b96178	Fix family of module	2018-11-03 11:38:29 +01:00
Laurent Destailleur	28d5f1d50b	Fix sql syntax error	2018-11-03 11:30:32 +01:00
Abbes Bahfir	5f4d644cab	New : help picto for fields in creation	2018-11-03 11:12:50 +01:00
ptibogxiv	171d36d4fc	Update payment.php	2018-11-02 17:49:11 +01:00
ptibogxiv	ab53885ef8	Fix with new stripe payment function	2018-11-02 17:22:42 +01:00
ptibogxiv	d5a910841f	Fix various fix cmail, payout, const, connect	2018-11-01 23:20:28 +01:00
ptibogxiv	b34f781686	Fix ext_payment_site	2018-11-01 23:04:10 +01:00
Alexandre SPANGARO	8d8023b405	Debug asset module	2018-11-01 22:32:33 +01:00
ptibogxiv	263e8ed4af	Fix payout	2018-11-01 20:45:08 +01:00
Maxime Kohlhaas	29c0448a2e	Fix parent link was not removed on societe deletion #9106	2018-11-01 15:41:58 +01:00
Maxime Kohlhaas	d1133916e0	Fix tracking field in dictionnary should not be mandatory	2018-11-01 15:33:14 +01:00
Laurent Destailleur	1140735554	Fix css	2018-11-01 15:20:05 +01:00
ptibogxiv	a46f29cb98	Update Stripe Version API ... The description field on customer endpoints has a maximum character length limit of 350 now. The name field on product endpoints has a maximum character length limit of 250 now. The description field on invoice line items has a maximum character length limit of 500 now. The billing_reason attribute of the invoice object now can take the value of subscription_create, indicating that it is the first invoice of a subscription. For older API versions, billing_reason=subscription_create is represented as subscription_update.	2018-11-01 12:02:36 +01:00
Philippe GRAND	b7f5e9e6c7	complete comment	2018-11-01 11:50:55 +01:00
Alexandre SPANGARO	af1305a0a8	Fix Specific finename for FEC export only available on general ledger export	2018-11-01 07:24:48 +01:00
Frédéric FRANCE	aa8236dd98	fix phpcs	2018-10-31 21:33:37 +01:00
Laurent Destailleur	970f501147	Debug modulebuilder	2018-10-31 20:10:20 +01:00
Laurent Destailleur	e4cfc2c6cb	Fix public	2018-10-31 17:30:08 +01:00
Laurent Destailleur	dfb20c705e	NEW Add hidden option EXPENSEREPORT_DEFAULT_VALIDATOR_UNCHANGEABLE	2018-10-31 16:05:50 +01:00
Laurent Destailleur	4b402aa6d1	Fix regression on name of array	2018-10-31 15:41:00 +01:00
Laurent Destailleur	be8e48b265	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php	2018-10-31 15:38:29 +01:00
Laurent Destailleur	07719eaf1e	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-10-31 15:31:44 +01:00
Laurent Destailleur	ca726e6c94	FIX Error generating ODT when option to use contact on doc on	2018-10-31 15:31:22 +01:00
Laurent Destailleur	0ca5da055f	Debug v9	2018-10-31 15:04:01 +01:00
Laurent Destailleur	693570c48b	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/core/modules/modSociete.class.php	2018-10-31 11:50:29 +01:00
Laurent Destailleur	c9ef298839	Fix setup template emails	2018-10-31 11:38:04 +01:00
Philippe GRAND	fe6b185bf1	Typo	2018-10-31 10:32:40 +01:00
Laurent Destailleur	ea5b0f53d0	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-10-30 22:32:54 +01:00
Laurent Destailleur	866729cd21	FIX bad link in notification	2018-10-30 22:32:42 +01:00
Laurent Destailleur	c764d7f8d5	Fix remove var_dump	2018-10-30 21:34:17 +01:00
Laurent Destailleur	a44fbfb2e9	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-30 21:30:57 +01:00
Laurent Destailleur	3d16b05fdb	Fix fetch	2018-10-30 21:30:44 +01:00
Frédéric FRANCE	46fd3bcaf8	fix display holiday month report if none	2018-10-30 21:15:52 +01:00
Laurent Destailleur	064417dcf1	Merge pull request #9889 from atm-maxime/fix_invoice_from_contract2 ... Fix invoice creation from contract was invoicing closed services #9087	2018-10-30 21:13:38 +01:00
Frédéric FRANCE	395e9ceae2	fix stats display expensereport	2018-10-30 20:36:12 +01:00
Frédéric FRANCE	da3ee9ad9a	Merge remote-tracking branch 'upstream/develop' into fieldlabel	2018-10-30 19:04:35 +01:00
Regis Houssin	9589f69574	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_email Conflicts: htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php	2018-10-30 18:29:28 +01:00
Laurent Destailleur	f845a52b20	Fix phpcs	2018-10-30 16:37:50 +01:00
Marc de Lima Lucio	2fbc305683	FIX: task time screen: last fix was overkill	2018-10-30 16:00:56 +01:00
Laurent Destailleur	a3e49f021d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-30 15:32:25 +01:00
Laurent Destailleur	2c3cd7a668	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/modSyslog.class.php	2018-10-30 15:32:09 +01:00
Laurent Destailleur	b9078c6d58	Fix phpcs	2018-10-30 15:30:04 +01:00
Laurent Destailleur	ecdecfcbce	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-10-30 15:28:23 +01:00
Laurent Destailleur	2b526f7469	Fix phpcs	2018-10-30 15:28:11 +01:00
Laurent Destailleur	68804cf8a5	Merge pull request #9890 from atm-maxime/fix_import_societe_alias ... FIX missing name alias field in societe import/export #9091	2018-10-30 15:00:34 +01:00
Laurent Destailleur	4dca94480e	Merge pull request #9892 from atm-maxime/fix_supp_inv_clone ... Fix invoice supplier clone was not getting all lines parameters #9800	2018-10-30 14:59:48 +01:00
Laurent Destailleur	cb2a5baa45	Merge pull request #9919 from atm-john/Fix_clone_fourn_invoice ... Fix clone fourn order and invoice lines special code	2018-10-30 14:55:50 +01:00
Laurent Destailleur	0c77f6c3c5	Merge pull request #9918 from bafbes/abb80041 ... Fix: To be possibly intercepted : call create, update and delete of the object instead of commonobject	2018-10-30 14:52:23 +01:00
Laurent Destailleur	c9d00848e6	Merge pull request #9914 from frederic34/patch-27 ... make play and playdisable equals	2018-10-30 14:49:54 +01:00
Laurent Destailleur	2c8b7a4a3d	Merge pull request #9905 from atm-maxime/fix_currency_change ... Fix changing currency in a doc was recalculating amounts in company currency #9801	2018-10-30 14:48:46 +01:00
Laurent Destailleur	4a71374cf7	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-30 14:48:09 +01:00
Laurent Destailleur	68f6ebd0ff	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/class/commande.class.php htdocs/core/lib/security.lib.php htdocs/modulebuilder/template/myobject_card.php	2018-10-30 14:47:39 +01:00
Laurent Destailleur	afe61579e8	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-10-30 14:29:26 +01:00
Laurent Destailleur	b0ef8680ff	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-10-30 14:28:25 +01:00
Laurent Destailleur	7a268d8d9f	Clean code	2018-10-30 14:27:14 +01:00
Laurent Destailleur	a231932972	Merge pull request #9904 from atm-maxime/fix_replenish_qtymin ... FIX replenish wasn't caring about supplier price min quantity #9561	2018-10-30 14:25:55 +01:00
Laurent Destailleur	0f850cfa3e	Merge pull request #9901 from frederic34/patch-22 ... use strict compare	2018-10-30 14:23:40 +01:00
Laurent Destailleur	76c3bac777	Merge pull request #9900 from frederic34/patch-21 ... use strict compare	2018-10-30 14:23:14 +01:00
Laurent Destailleur	a16e7a84e9	Merge pull request #9899 from frederic34/patch-20 ... use strict compare	2018-10-30 14:23:01 +01:00
Laurent Destailleur	6c9f02e9c6	Merge pull request #9898 from frederic34/patch-18 ... use strict compare	2018-10-30 14:22:19 +01:00
Laurent Destailleur	81c70898bf	Merge pull request #9884 from hregis/develop_bug ... FIX $forceentity is not used, replace by $currentobject if needed	2018-10-30 14:16:29 +01:00
Laurent Destailleur	8ce035fc36	Merge pull request #9894 from librethic-code/patch-1 ... FIX: keep external module element when adding resource	2018-10-30 14:06:38 +01:00