68865 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Laurent Destailleur	533c19cc2c	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/accountancy/customer/list.php htdocs/core/lib/functions.lib.php	2018-06-22 15:29:26 +02:00
Laurent Destailleur	8414ceaddb	Merge pull request #9000 from ATM-Marc/FIX_7.0_propal_contact_SHIPPING ... FIX: proposal: missing contact type translation key	2018-06-22 15:16:56 +02:00
Laurent Destailleur	1bf0432a72	Merge pull request #8997 from ptibogxiv/patch-29 ... add minute to duration services	2018-06-22 15:12:57 +02:00
Laurent Destailleur	1cef4c1563	Merge pull request #8995 from ATM-Marc/FIX_develop_PR8841 ... FIX PR #8841	2018-06-22 15:10:33 +02:00
Laurent Destailleur	ac19a6e211	Merge pull request #8993 from hregis/develop_pgsql ... Fix: wrong field name, use "type" instead "llx_c_type_fees"	2018-06-22 15:09:31 +02:00
Laurent Destailleur	bd7277431f	Merge pull request #8986 from atm-greg/fix_desired_stock ... FIX bad result on fetch ProductStockEntrepot	2018-06-22 15:01:19 +02:00
Laurent Destailleur	dab264c641	Merge pull request #8994 from hregis/6.0_multicompany ... Fix: to avoid deleting line breaks	2018-06-22 15:00:26 +02:00
Laurent Destailleur	c3c809cfc1	Merge pull request #9001 from dani/sync_rfc2307_members ... Sync rfc2307 group membership from LDAP	2018-06-22 14:56:45 +02:00
Laurent Destailleur	11d4241221	Merge pull request #9002 from grandoc/new_branch_21_06_2018 ... clean and update code	2018-06-22 14:55:11 +02:00
Laurent Destailleur	430dea917e	Merge pull request #9005 from dolibarr95/patch-47 ... FIX: Add rights check in shipping	2018-06-22 14:54:47 +02:00
Laurent Destailleur	0f80508be1	Fix canvas on list is a feature going in the wall so i clean this.	2018-06-22 14:51:47 +02:00
Laurent Destailleur	cfc8e8b0ef	Merge pull request #8972 from fmarcet/7.0 ... FIX Avoid converting into reduction twice and draft invoice	2018-06-22 14:35:26 +02:00
Laurent Destailleur	5bee324578	Update paiement.class.php	2018-06-22 14:34:59 +02:00
Laurent Destailleur	77e7b5793f	Fix translation	2018-06-22 14:31:45 +02:00
dolibarr95	45451f08b0	Add rights check ... Add rights check when edit parcel informations(weight, tracking...) of a shipping	2018-06-22 12:25:14 +02:00
atm-quentin	d8ebb5da8d	FIX trans	2018-06-22 11:02:20 +02:00
Laurent Destailleur	81497687e9	Fix missing oldcopy in trigger call	2018-06-22 10:55:36 +02:00
atm-quentin	d53aa71673	NEW advance target filtering can be used everywhere with tpl and fk_element	2018-06-22 10:54:00 +02:00
Laurent Destailleur	88d3bf0148	FIX creation of tasks must hide closed project	2018-06-21 18:47:02 +02:00
Philippe GRAND	da2f07c848	clean and update code	2018-06-21 15:01:45 +02:00
Daniel Berteaud	f4bfd8704d	Sync rfc2307 group membership from LDAP ... With rfc2307 LDAP scheme, group members are listed in the memberUid attribute, as simple uid, not as full DN like rfc2307bis, or AD-style groups	2018-06-21 10:21:18 +02:00
Laurent Destailleur	cfcedc1170	Fix remove old unique key constraint	2018-06-21 00:11:37 +02:00
Laurent Destailleur	1a8afeff2a	Fix error message	2018-06-20 23:50:50 +02:00
Laurent Destailleur	2d89d9634b	Fix search on extrafields	2018-06-20 23:16:06 +02:00
Laurent Destailleur	a3b9d4f01b	Fix tooltip on subsidiary list	2018-06-20 22:02:36 +02:00
Laurent Destailleur	07c514b85c	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/fourn/class/fournisseur.product.class.php htdocs/projet/class/projectstats.class.php	2018-06-20 21:56:10 +02:00
Laurent Destailleur	828a9296b4	Fix stats on project	2018-06-20 21:52:06 +02:00
Laurent Destailleur	714057d435	Fix stats on project. Must use assignement on project as filter.	2018-06-20 21:31:37 +02:00
Laurent Destailleur	90b2314d98	Code comment	2018-06-20 21:24:57 +02:00
Laurent Destailleur	9f2437fa04	Fix missing field	2018-06-20 17:59:01 +02:00
Marc de Lima Lucio	2fab4d7f76	FIX: proposal: missing contact type translation key	2018-06-20 14:56:24 +02:00
dolibarr95	3b33dad8fd	Add supplier ref ... Hi In all common case the supplier send a receipt with the parcel on which is writen his product ref (because this is his reference) with the quantity in the parcel and if he is smart/nice our reference. By adding the supplier ref column the supplier order dispatch is easier. Tks.	2018-06-20 14:40:32 +02:00
ptibogxiv	a6151ee11e	add minute to duration services ... add minute for duration description (more compliant thant 0,166667h for billing services by minute	2018-06-20 12:10:25 +02:00
Philippe GRAND	4f554ab52a	clean and update code	2018-06-20 12:09:47 +02:00
Marc de Lima Lucio	dc951029cd	Merge branch 'develop' of github.com:Dolibarr/dolibarr into FIX_pdf_note_incoterm	2018-06-20 10:31:35 +02:00
Marc de Lima Lucio	babc99465c	FIX PR #8841	2018-06-20 10:22:43 +02:00
Marc de Lima Lucio	9fa9a716d5	FIX: pdf: overlap when linked elements and incoterms/public note displayed + port PR #8155 into supplier docs & contracts	2018-06-20 10:22:43 +02:00
Regis Houssin	8fc2f7441c	Fix: to avoid deleting line breaks	2018-06-20 09:06:16 +02:00
Regis Houssin	e1db5ab433	Fix: wrong field name, use "type" instead "llx_c_type_fees"	2018-06-19 19:56:39 +02:00
Laurent Destailleur	a73296e212	Fix reseller not saved	2018-06-19 19:34:23 +02:00
Regis Houssin	b9fe6f8624	Fix: avoid warning	2018-06-19 19:00:23 +02:00
Regis Houssin	2c927dba01	Fix: wrong var name "shownav"	2018-06-19 18:33:22 +02:00
Regis Houssin	b9893bde1d	Fix: avoid Warning: A non-numeric value encountered	2018-06-19 18:26:37 +02:00
bgenere	403116898f	Fix cherry-pick	2018-06-19 18:25:52 +02:00
Laurent Destailleur	19e40466b1	css	2018-06-19 13:26:30 +02:00
Laurent Destailleur	fb2e820329	Fix menu not visible on jmobile	2018-06-19 13:17:46 +02:00
Laurent Destailleur	b364412a4a	FIX Menu scheduled jobs not visible on jmobile conf	2018-06-19 13:10:13 +02:00
a-schild	baba0757d7	Added filtering by prospect type and status ... Added filtering by prospect type and status	2018-06-19 11:46:03 +02:00
a-schild	211bb87e46	Moved functionality to select by categories ... Moved functionality to select by categories	2018-06-19 11:45:27 +02:00
atm-greg	df056980b5	fix bad result on fetch ProductStockEntrepot	2018-06-19 10:46:07 +02:00