2750 Commits

Author	SHA1	Message	Date
Laurent Destailleur	758b8e1f7e	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/core/boxes/box_project.php	2015-11-21 12:32:03 +01:00
Laurent Destailleur	c04743aa84	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-11-21 12:23:51 +01:00
arnaud	4233d24f4b	FIX export with category contact extrafields	2015-11-19 18:01:58 +01:00
aspangaro	ad457b416d	Use menu & add mode 'employee' in user/index.php	2015-11-17 22:51:34 +01:00
aspangaro	258ac45519	Remove obsolete code	2015-11-17 22:14:39 +01:00
aspangaro	a5ca6cb732	Merge remote-tracking branch 'Upstream/develop' into develop-hrm3	2015-11-17 20:34:37 +01:00
Laurent Destailleur	f5631cac45	NEW Introduce property module_position so a module can decide where it ... appears into list of modules.	2015-11-17 00:58:12 +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	ab177b43af	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: ChangeLog htdocs/.gitignore htdocs/comm/mailing/card.php htdocs/commande/list.php htdocs/compta/facture.php htdocs/expedition/class/expedition.class.php	2015-11-13 12:35:10 +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
arnaud	aaa6f00d11	FIX export propal and order with extrafields	2015-11-12 12:37:04 +01:00
aspangaro	30c4f1c896	HRM : language	2015-11-12 07:40:46 +01:00
aspangaro	bedba7ffb7	HRM: add a mode 'employee' for development to show tab	2015-11-12 07:26:51 +01:00
aspangaro	20872498ba	HRM: Add a tab for holiday module in employee card	2015-11-12 06:58:26 +01:00
Laurent Destailleur	350ef610e9	Fix beluga pdf for projects. Add missing expense reports.	2015-11-07 12:36:34 +01:00
philippe grand	5f74a0f1c0	Traduction	2015-11-06 09:46:18 +01:00
Laurent Destailleur	2dc644da30	Debug Direct print module using the OAuth setup.	2015-11-06 01:33:49 +01:00
Laurent Destailleur	e4bd99aaf3	Merge pull request #3904 from frederic34/printgcp ... Google Cloud Print	2015-11-05 21:57:08 +01:00
Laurent Destailleur	a7cea65710	Merge pull request #3903 from atm-alexis/3.9_FIX_crabe_model_for_ISO_address_emplacement ... NEW add an option to use standard ISO location for bill in crabe model	2015-11-05 21:51:38 +01:00
Laurent Destailleur	f3b8df3ea5	Merge pull request #3889 from frederic34/escpos ... Receipt Printer conf and lang	2015-11-05 21:32:43 +01:00
frederic34	3ef6a92bb1	Google Cloud Print	2015-11-05 18:04:00 +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
Laurent Destailleur	41ccfc411a	Better error message	2015-11-05 10:11:39 +01:00
frederic34	1a374ddd2c	Receipt Printer conf and lang	2015-11-05 08:42:03 +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
Laurent Destailleur	09f3cd6f1d	Fix class cant be abstract	2015-11-04 16:43:24 +01:00
frederic34	5c725aceb8	sql	2015-11-03 22:12:03 +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	1bcda200e3	A module to setup OAuth. OK, but what to do once setup of a client ... id/secret is done ?	2015-11-02 20:48:27 +01:00
Laurent Destailleur	563a020595	NEW Free text for cheque deposit receipt can be HTML content.	2015-11-02 20:35:33 +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	67a2f6ee91	Merge pull request #3854 from fmarcet/3.8 ... FIX: Send emails to contacts who should not receive emails	2015-11-02 18:03:59 +01:00
Laurent Destailleur	f928062e2b	FIX #3726 Better support for PRODUCT_USE_OLD_PATH_FOR_PHOTO	2015-11-02 17:56:32 +01:00
fmarcet	3c5903f75a	FIX: Contacts are not added to the list with the status "no contact"	2015-11-02 11:52:58 +01:00
frederic34	9149032a03	Merge remote branch 'upstream/develop' into printgcp ... Conflicts: htdocs/core/actions_printing.inc.php	2015-11-02 11:43:34 +01:00
aspangaro	6df524bcb0	Remove blank page	2015-11-01 22:54:04 +01:00
frederic34	b9367bb196	Errors management	2015-11-01 11:24:51 +01:00
frederic34	2b4224d4c4	List Jobs	2015-11-01 10:10:14 +01:00
frederic34	2f3e6958f9	Receipt Printer	2015-11-01 00:58:08 +01:00
frederic34	bb06a55844	Work on list jobs	2015-10-31 23:27:10 +01:00
frederic34	b6be372c4b	Merge remote branch 'upstream/develop' into printgcp	2015-10-30 18:12:34 +01:00
frederic34	e90f68906e	SQL tables for oauth	2015-10-30 17:59:45 +01:00
frederic34	1694c690ed	Printing with Google Cloud Print	2015-10-30 17:22:06 +01:00
Ferran Marcet	5862037d34	FIX Bad parameters	2015-10-30 13:03:34 +01:00