6584 Commits

Author	SHA1	Message	Date
Laurent Destailleur	2d50cc92b9	Differentiate title for customer and supplier orders/invoices.	2015-03-31 11:32:47 +02:00
Laurent Destailleur	9d752c6fca	Sync from transifex	2015-03-30 10:55:08 +02:00
Laurent Destailleur	b83e9ea32f	Merge branch 'loan' of https://github.com/frederic34/dolibarr into ... frederic34-loan Conflicts: htdocs/compta/bank/ligne.php	2015-03-30 02:56:26 +02:00
frederic34	b6b1617741	Work on payment loan	2015-03-29 17:53:36 +02:00
Laurent Destailleur	018a0d779f	Fix translation	2015-03-29 15:18:10 +02:00
aspangaro	a92f68a5ed	Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc	2015-03-29 09:25:06 +02:00
aspangaro	ce6df7c022	Debug	2015-03-29 09:20:32 +02:00
frederic34	be1595a187	Add tab for notes	2015-03-28 17:42:33 +01:00
frederic34	af92174ae2	Small correction but unable to make loan payment	2015-03-28 17:15:07 +01:00
frederic34	7282a6faf2	Trans in Loan Calculator	2015-03-28 10:59:10 +01:00
frederic34	680317f250	Trans in Loan Calculator	2015-03-28 10:02:33 +01:00
aspangaro	77b123cb2d	Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc	2015-03-27 06:30:35 +01:00
Laurent Destailleur	60c24f7162	Merge pull request #2478 from frederic34/listexpe ... Add last shipments to company card	2015-03-27 01:04:05 +01:00
aspangaro	f0823a215b	Add language key	2015-03-26 21:16:52 +01:00
aspangaro	4209deafd2	Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc	2015-03-26 21:04:20 +01:00
aspangaro	059bb40345	Debug	2015-03-26 20:43:34 +01:00
Laurent Destailleur	1ca95acbd7	Fix pb during export of agenda events ... Conflicts: htdocs/exports/export.php	2015-03-26 11:23:21 +01:00
Laurent Destailleur	ce8bd7a515	Fix pb during export of agenda events	2015-03-26 11:20:39 +01:00
aspangaro	679391d337	Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc	2015-03-25 20:59:48 +01:00
Laurent Destailleur	ab739e162c	Merge remote-tracking branch 'origin/3.7' into develop	2015-03-25 18:11:29 +01:00
frederic34	19540b14b5	Add last shipments to company card	2015-03-25 16:38:18 +01:00
Laurent Destailleur	a32fc9efce	Hide logo when option MAIN_OPTIMIZEFORTEXTBROWSER is set. ... Avoid logo to overwrap box with css. Add help text.	2015-03-24 14:08:56 +01:00
Laurent Destailleur	f75c115140	Fix translation ... Fix permission not managed into get_menudiv.php	2015-03-24 11:19:51 +01:00
aspangaro	9d34b40897	Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc ... Conflicts: htdocs/compta/bank/account.php	2015-03-24 05:28:57 +01:00
aspangaro	be0ab4c9b4	Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc ... Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-03-23 06:58:25 +01:00
aspangaro	c4d852ffd7	Correct from frederic34	2015-03-22 20:57:41 +01:00
aspangaro	414d4c6432	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2015-03-22 18:08:12 +01:00
Laurent Destailleur	55140afde4	Merge branch 'price-global-variables' of ... https://github.com/IonAgorria/dolibarr into IonAgorria-price-global-variables Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql htdocs/product/dynamic_price/editor.php	2015-03-22 12:45:04 +01:00
aspangaro	0e01dbd44e	Update work	2015-03-20 06:36:48 +01:00
Laurent Destailleur	f44d91e153	NEW: The notification module accept keyword __SUPERVISOR__ to send ... notification to supervisor of user.	2015-03-19 11:47:30 +01:00
Laurent Destailleur	6ceda02eaa	NEW: Enhancement of module 'Notification by Email'. Show nb of ... notifications set. Can set several emails. Can set a threshold on amount for notifications. Add notification on supplier order validation.	2015-03-18 21:44:57 +01:00
Laurent Destailleur	b0b88be81f	Sync transifex	2015-03-18 15:27:27 +01:00
Laurent Destailleur	5d4d8151c1	Work on new timesheet input pages.	2015-03-18 11:04:50 +01:00
Laurent Destailleur	6d7b340cee	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/commande/class/commande.class.php htdocs/core/class/dolgraph.class.php htdocs/langs/en_AU/main.lang htdocs/langs/fr_FR/admin.lang htdocs/langs/fr_FR/main.lang htdocs/langs/fr_FR/other.lang	2015-03-16 18:30:30 +01:00
Laurent Destailleur	60c72e13b3	Some fixes into export and translation	2015-03-15 23:39:53 +01:00
Ion Agorria	2d09d8196f	Language additions	2015-03-14 16:51:50 +01:00
Laurent Destailleur	5670e92842	Position of field into pdf baleine	2015-03-14 12:35:03 +01:00
Laurent Destailleur	0ef2369399	Enhance tools to make transifex sync	2015-03-14 02:37:18 +01:00
Laurent Destailleur	7a877e9cfb	Restore correct keys	2015-03-14 00:51:12 +01:00
Laurent Destailleur	a8e7d90ea3	Sync transifex	2015-03-13 22:02:53 +01:00
Laurent Destailleur	687e3d250b	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: dev/fixdosfiles.sh htdocs/core/tpl/objectline_edit.tpl.php	2015-03-13 17:46:31 +01:00
Laurent Destailleur	f75749cc2b	Sync transifex	2015-03-13 17:43:04 +01:00
Laurent Destailleur	dfe1ee7e7d	Fix: count of notification emails was wrong	2015-03-13 14:11:59 +01:00
Laurent Destailleur	622d8ad9b0	Remove duplicate entry	2015-03-13 13:51:35 +01:00
aspangaro	3897e65425	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2015-03-11 05:28:59 +01:00
Laurent Destailleur	51b67704ee	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-03-10 13:46:44 +01:00
Laurent Destailleur	194260fc5b	NEW: Add search box for supplier order search.	2015-03-10 13:25:25 +01:00
Laurent Destailleur	2ea3eb3505	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-03-10 10:12:08 +01:00
Laurent Destailleur	90abe5cdf9	NEW: Add current salary on list of payment	2015-03-10 09:29:24 +01:00
Laurent Destailleur	84695845bb	Some fixes into translation and permissions	2015-03-09 21:20:56 +01:00