6064 Commits

Author	SHA1	Message	Date
Laurent Destailleur	f79aeeeb0b	Merge pull request #4068 from aspangaro/develop-accountancy ... Fix: typo on finance journal	2015-11-25 23:33:29 +01:00
aspangaro	3457a732f5	New: Better integration of skype	2015-11-25 20:19:18 +01:00
Raphaël Doursenaud	91ce70a6e9	FIX #4081 Added missing translation	2015-11-23 17:25:10 +01:00
aspangaro	0899e7392b	Fix: typo on finance journal	2015-11-22 22:11:22 +01:00
Laurent Destailleur	ffeae34f51	Update doc	2015-11-22 18:41:35 +01:00
Laurent Destailleur	73bcc3bfe3	The temp dir for cache used by rester is correctly managed: No temp or ... data files must be stored outside of documents directory.	2015-11-22 17:39:13 +01:00
Laurent Destailleur	3aa25cd2be	Merge pull request #4064 from frederic34/escpos ... Add profile escpos printer	2015-11-22 17:09:15 +01:00
Laurent Destailleur	91f1acd1f1	Merge pull request #4063 from grandoc/develop ... fix : Typo and translation	2015-11-22 17:07:22 +01:00
frederic34	6b4b70bdbb	translations and help	2015-11-22 14:11:33 +01:00
Laurent Destailleur	cb3765bc92	Debug module Resource	2015-11-22 12:23:10 +01:00
philippe grand	210c6c67cd	better translation and missing translation	2015-11-22 10:40:04 +01:00
Laurent Destailleur	e3c6e4ebe5	NEW Add planned workload and declared progress on project summary list ... on project home page (data aggregated from tasks of project)	2015-11-21 20:00:38 +01:00
Laurent Destailleur	9db71098ac	Merge pull request #4031 from FHenry/develop ... PG SQL	2015-11-21 01:50:47 +01:00
Laurent Destailleur	a906774595	Merge pull request #3979 from atm-alexis/3.9_NEW_add_billed_status_for_supplier_order ... NEW 3.9 add billed status for supplier order	2015-11-21 00:20:17 +01:00
Florian HENRY	b8cab9f4d9	continue extrafeild $ID$ and SELECT feature	2015-11-20 13:51:57 +01:00
Florian HENRY	1566be35a1	NEW : add $ID$ into extrafields management to allow use current object ... id on filter for select list from table and checkbox list from table	2015-11-20 11:59:28 +01:00
aspangaro	a5ca6cb732	Merge remote-tracking branch 'Upstream/develop' into develop-hrm3	2015-11-17 20:34:37 +01:00
fappels	e9be3d19f4	Fix migration - remove default for text field ... remove default for user_param value text field lang typo	2015-11-16 21:24:08 +01:00
Alexis Algoud	55b23c4918	FIX add billed field in supplier order	2015-11-16 14:55:46 +01:00
Laurent Destailleur	6bd6be0912	Debug and rename experimental module "supplier proposal". Still work to ... do: Must fix the PDF to be compliant with a request quotation to a supplier (so no need to show vat, unit price, ...).	2015-11-15 19:23:39 +01:00
Laurent Destailleur	db941d5395	NEW Enhance style engine. Add option to set color of links	2015-11-15 11:31:09 +01:00
Laurent Destailleur	192fdbdcc4	Minor look uniformization	2015-11-14 23:10:12 +01:00
aspangaro	0f75d76296	Merge remote-tracking branch 'Upstream/develop' into develop-hrm3	2015-11-13 07:52:44 +01:00
Laurent Destailleur	471bcdd29f	Remove hard coded list of permissions.	2015-11-13 02:21:27 +01:00
aspangaro	30c4f1c896	HRM : language	2015-11-12 07:40:46 +01:00
aspangaro	7693b407e8	HRM: Begin to work on employee card	2015-11-12 06:59:40 +01:00
aspangaro	4ce6287d52	Merge remote-tracking branch 'Upstream/develop' into develop-hrm3	2015-11-12 05:51:12 +01:00
aspangaro	f602e1fba7	HRM : Add an email address in admin to prevent HRM external service (public accountant for exemple)	2015-11-12 05:48:56 +01:00
Laurent Destailleur	2bd0f04d8f	Add feature to get nb of top menu entrie ... Fix translation of units	2015-11-12 00:48:37 +01:00
frederic34	cd738ef483	Merge remote branch 'upstream/develop' into fccard ... Conflicts: htdocs/commande/card.php	2015-11-11 17:23:37 +01:00
frederic34	b8a84d68ec	add messages	2015-11-09 18:19:10 +01:00
Laurent Destailleur	096ec3100d	Merge pull request #3926 from frederic34/fccard ... allow chaining and remove header exit	2015-11-08 15:49:33 +01:00
Laurent Destailleur	350ef610e9	Fix beluga pdf for projects. Add missing expense reports.	2015-11-07 12:36:34 +01:00
frederic34	7349862b64	translations	2015-11-07 11:19:31 +01:00
Laurent Destailleur	f9d0c887ae	NEW Add a refresh button on page list of direct print jobs.	2015-11-06 02:20:42 +01:00
Laurent Destailleur	2dc644da30	Debug Direct print module using the OAuth setup.	2015-11-06 01:33:49 +01:00
Alexis Algoud	8221817087	NEW add an option to use standard ISO location for bill in crabe model ... For electronic sending solutions, it could be required	2015-11-05 16:17:09 +01:00
philippe grand	b9c0cd316f	[Qual] Fix : TODO:translate	2015-11-05 11:11:51 +01:00
Laurent Destailleur	41ccfc411a	Better error message	2015-11-05 10:11:39 +01:00
Laurent Destailleur	1f4481a6b0	Merge pull request #3172 from atm-maxime/new_creditnote ... NEW Add hidden option INVOICE_CREDIT_NOTE_STANDALONE to allow to create credit note without invoice	2015-11-05 02:45:15 +01:00
Laurent Destailleur	11b7d8a44c	Merge pull request #3873 from frederic34/escpos ... Escpos Receipt printer	2015-11-05 02:18:09 +01:00
Laurent Destailleur	e26940ddf7	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/core/lib/admin.lib.php htdocs/core/modules/DolibarrModules.class.php htdocs/fourn/ajax/getSupplierPrices.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/install/filelist.xml htdocs/install/mysql/migration/3.8.0-3.9.0.sql htdocs/societe/price.php	2015-11-05 01:50:30 +01:00
frederic34	644a104d5f	start to parse template	2015-11-04 23:14:50 +01:00
frederic34	d362d889f6	wip	2015-11-03 20:50:01 +01:00
Laurent Destailleur	cd68ea9d0f	Fix: We must use external URL for OAuth.	2015-11-02 21:42:11 +01:00
Laurent Destailleur	ffe1284a85	Merge pull request #3840 from frederic34/printgcp ... Printing with Google Cloud Print	2015-11-02 20:09:13 +01:00
Laurent Destailleur	da0aa2f937	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/core/class/html.form.class.php htdocs/core/lib/pdf.lib.php htdocs/langs/en_US/main.lang htdocs/product/list.php htdocs/product/stock/mouvement.php	2015-11-02 19:31:42 +01:00
Laurent Destailleur	055fe5e275	FIX #3786 Translation of select box.	2015-11-02 19:17:22 +01:00
Laurent Destailleur	bb26e1c195	Merge pull request #3860 from frederic34/patch-5 ... Update resource.lang	2015-11-02 18:06:31 +01:00
Frédéric FRANCE	76c89884ba	Update resource.lang	2015-11-02 17:32:02 +01:00