42607 Commits

Author	SHA1	Message	Date
jfefe	a618274760	Allow modify API key from user card	2015-05-29 16:05:52 +02:00
Alexis Algoud	dd7febe2b9	replace test by getEntity()	2015-05-29 15:10:59 +02:00
Alexis Algoud	ab0f805044	Merge branch '3.6' of https://github.com/Dolibarr/dolibarr into fix_multientity_num_check	2015-05-29 15:09:04 +02:00
Gauthier	a707d40251	FIX : when we create an agenda event with "Not applicable" status, it is automatically saved with "To do" status	2015-05-29 14:32:50 +02:00
Regis Houssin	c8c0f0f038	Fix: possibility to shared facnumber between entities	2015-05-29 11:31:51 +02:00
Regis Houssin	49fc7f9ba7	Fix: check the user status during authentication	2015-05-29 10:09:18 +02:00
Regis Houssin	131c3fcef8	Fix: check the user status during authentication	2015-05-29 10:07:48 +02:00
aspangaro	27c0b84a13	Typo on search	2015-05-29 06:54:16 +02:00
aspangaro	fd988ab1f3	Review card of supplier/customer ventilation	2015-05-29 06:43:40 +02:00
aspangaro	47045e0746	Accountancy: Review presentation	2015-05-28 21:34:35 +02:00
Arnaud Aujon	3003b41a88	add test for invoices API	2015-05-28 16:57:28 +02:00
Arnaud Aujon	05a7ab158b	add deleteThirdParty api call + add tests	2015-05-28 16:56:45 +02:00
aspangaro	0bd07b795f	NEW: Add tab document on salaries payment	2015-05-28 07:33:50 +02:00
aspangaro	d3513bf2a7	Fix: lot of typo to export salaries	2015-05-28 06:41:01 +02:00
aspangaro	58893a4576	Fix: problem of rights to export salaries	2015-05-28 06:26:28 +02:00
aspangaro	a8c49f11ca	ER add key language	2015-05-28 06:16:58 +02:00
aspangaro	432cf998fa	Fiche-rec: Forms are using the tab look, even in creation & add cancel button	2015-05-28 05:25:29 +02:00
aspangaro	33807c467d	Fix: Wrong language key	2015-05-27 21:54:06 +02:00
Arnaud Aujon	278d447e45	Use Constant for status	2015-05-27 15:42:34 +02:00
phf	a676d3a0d1	Merge branch '3.6' into 3.7	2015-05-27 10:56:16 +02:00
phf	5a006d824e	FIX : top links menu have target attribute with wrong value	2015-05-27 10:52:23 +02:00
aspangaro	8eee0bdf73	NEW Forms are using the tab look, even in creation mode	2015-05-27 07:41:25 +02:00
aspangaro	5f5388a52a	Fix: wrong link	2015-05-27 07:19:10 +02:00
BENKE Charlie	d16bfcc294	adding hook for more action buttons ... allow additionnal hook action (like myField)	2015-05-26 15:00:23 +02:00
phf	087b026f54	Add fetch extrafields in contact's fetch function	2015-05-26 12:40:49 +02:00
atm-ph	74c4db0f57	Remove comment ... This comment is false, my $_SESSION was wrong	2015-05-26 11:23:25 +02:00
Francis Appels	b9c3dec141	Fix: issue #2859 unit form select	2015-05-26 11:14:15 +02:00
phf	3c0da7e2d7	FIX : extrafields required on thirdparty	2015-05-26 10:54:31 +02:00
Arnaud Aujon	23936827a8	Merge remote-tracking branch 'upstream/develop' into 3.7-webservices-fix	2015-05-26 10:54:30 +02:00
Laurent Destailleur	afd7366459	Css	2015-05-26 09:22:34 +02:00
Laurent Destailleur	bf334d8711	NEW Thumbs for statistics on main page are fully clicable (not only link ... inside the thumb)	2015-05-26 09:13:48 +02:00
Laurent Destailleur	06faf762d4	Merge pull request #2865 from marcosgdf/bug-2843 ... Closed bug #2843 Wrong SQL table called	2015-05-25 19:34:33 +02:00
Laurent Destailleur	cb0b0fba7c	Merge pull request #2897 from atm-ph/fix_37_create_contact ... FIX : create contact with extrafiel is null when it is require	2015-05-25 19:28:17 +02:00
Laurent Destailleur	76380c2288	Merge pull request #2898 from defrance69/patch-62 ... Tabs collector better identification	2015-05-25 19:27:39 +02:00
Laurent Destailleur	0321257fbe	Merge pull request #2887 from GPCsolutions/dolibarr-2886 ... Deprecation of the mysql driver	2015-05-25 18:50:40 +02:00
Laurent Destailleur	a4164a6656	Merge pull request #2883 from bafbes/develop ... Fix non existing "supplier invoice setting to draft" trigger	2015-05-25 18:49:57 +02:00
Laurent Destailleur	c2decc8aea	Merge pull request #2895 from atm-ph/fix_37_balise_script ... FIX : "script" balise with wrong syntax	2015-05-25 18:49:15 +02:00
Laurent Destailleur	c8949d0532	Some doxygen fixes	2015-05-25 18:43:46 +02:00
BENKE Charlie	a30d4d4be6	Tabs collector better identification ... Tabs collector goes wrong with 2 tabs in the same page (like projet and task), so we use picto name to identify the 2 tabscollect We need to substract the @ if the tabs is from a module... eg : factory@factory	2015-05-25 18:14:49 +02:00
Laurent Destailleur	11d4a945b0	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/adherents/liste.php htdocs/comm/propal.php htdocs/compta/facture.php htdocs/contact/list.php htdocs/contrat/liste.php htdocs/product/liste.php	2015-05-25 18:08:23 +02:00
Laurent Destailleur	a33809a526	Merge remote-tracking branch 'origin/3.5' into 3.6 ... Conflicts: htdocs/adherents/liste.php htdocs/comm/propal.php htdocs/compta/facture.php	2015-05-25 17:46:42 +02:00
phf	7b163d3b29	FIX : create contact with extrafiel is null when it is require	2015-05-25 17:36:36 +02:00
Raphaël Doursenaud	ec2035a73e	Allow usage of contact extrafield element type ... As documented in the methods comments	2015-05-25 17:19:27 +02:00
phf	33ad86261a	FIX : width multiselect	2015-05-25 16:42:51 +02:00
phf	a5f2617166	FIX : "script" balise with wrong syntax	2015-05-25 15:52:41 +02:00
Marcos García de La Fuente	460a2ec2ab	Merge branch 'develop' into commercial-name ... Conflicts: htdocs/categories/categorie.php htdocs/comm/prospect/list.php	2015-05-25 15:09:46 +02:00
Marcos García de La Fuente	c0346bcba4	Fixed typo	2015-05-25 14:59:34 +02:00
Steve Braun	d1c7c9489e	fixes #2847	2015-05-25 14:56:37 +02:00
Marcos García de La Fuente	8627f2f19b	Removed innecesary test	2015-05-25 14:01:15 +02:00
Juanjo Menent	5ddcfce908	Merge pull request #2890 from GPCsolutions/categories-types ... Include Categories class whenever Categorie::TYPE is used	2015-05-24 11:38:09 +02:00
Raphaël Doursenaud	becc240b92	Include Categories class whenever Categorie::TYPE is used	2015-05-23 23:35:49 +02:00
Raphaël Doursenaud	c018858e91	Deprecation of the mysql driver ... Fix #2886	2015-05-23 20:43:21 +02:00
Juanjo Menent	55b7dab292	Merge pull request #2884 from GPCsolutions/categories-types ... Added types constants to categories	2015-05-23 19:09:07 +02:00
Raphaël Doursenaud	ee808cdfd7	Added types constants to categories	2015-05-23 18:52:31 +02:00
Juanjo Menent	e9d58c06a2	Merge pull request #2882 from GPCsolutions/dolibarr-2881 ... Make select_salesrepresentative() return 0 when empty	2015-05-23 17:22:59 +02:00
Raphaël Doursenaud	139b41c014	Make select_salesrepresentative() return 0 when empty ... Fix #2881	2015-05-23 16:38:59 +02:00
abb	ebf2edf019	added new trigger for supplier invoice unvalidation "BILL_SUPPLIER_UNVALIDATE" in set_draft class function	2015-05-23 15:35:19 +01:00
abb	879c82ee0a	added new trigger for supplier invoice unvalidation "BILL_SUPPLIER_UNVALIDATE" in trigger demo file	2015-05-23 15:28:51 +01:00
abb	4e48f24507	added new trigger for supplier invoice unvalidation "BILL_SUPPLIER_UNVALIDATE" in Database	2015-05-23 15:12:24 +01:00
abb	ba68598ec7	added new trigger for supplier invoice unvalidation in Agenda	2015-05-23 15:09:44 +01:00
Raphaël Doursenaud	5fe31e90c8	Remove duplicate modify button on user's card ... Fix #2879	2015-05-23 15:32:09 +02:00
Alexis Algoud	91885c9d6f	FIX when multicompany was enabled, this function didn't check just on the good entity (problem when both company use same mask)	2015-05-22 17:22:57 +02:00
Laurent Destailleur	0b40502878	Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5	2015-05-22 17:14:53 +02:00
Laurent Destailleur	dcc197eb6b	Fix bug debian 786479	2015-05-22 17:13:32 +02:00
Laurent Destailleur	2f5d1f5965	Merge pull request #2842 from atm-alexis/fix_email_cc_in_selectlist_on_propal ... Fix email cc in selectlist on propal/bill	2015-05-22 16:56:53 +02:00
Laurent Destailleur	4de46892d1	Merge pull request #2872 from atm-alexis/fix_button_create_payment_on_social_tax_less_than_1euro ... FIX button create payment hide if tax amount is less than 1	2015-05-22 16:53:49 +02:00
phf	b9ed61eed4	FIX : update usergroup name	2015-05-22 16:46:28 +02:00
Laurent Destailleur	995a2c127d	Working on finishing of look	2015-05-22 15:29:19 +02:00
Laurent Destailleur	390c7d8e65	Fix link to prospect with filter on commercial status ... Enhance natural_search method to allow to search on several ids.	2015-05-22 15:19:27 +02:00
Laurent Destailleur	4319cd63a3	Working on finishing of look	2015-05-22 14:28:02 +02:00
Laurent Destailleur	97ba2cf0e9	Replace ol icon for delete with new one	2015-05-22 12:21:55 +02:00
Laurent Destailleur	6f5a30638c	NEW On page to see/edit contact of an ojbect, the status of contact is ... visible (for both external and internal users).	2015-05-22 12:21:36 +02:00
Maxime Kohlhaas	ff6708840d	Fix : facturestats was not filtering on invoice type	2015-05-22 09:23:28 +02:00
Alexis Algoud	81a919e8a3	round to price2num	2015-05-22 09:05:38 +02:00
Laurent Destailleur	f35c41cc7e	Introduce hidden option "MAIN_FIX_FLASH_ON_CHROME" to solve a strange ... behaviour of chrome making page to be flashed before rendered.	2015-05-22 01:48:36 +02:00
Laurent Destailleur	6108dfad55	Minor enhancement	2015-05-22 00:46:53 +02:00
Laurent Destailleur	fb923c0c2b	Merge pull request #2867 from aspangaro/develop-resource ... NEW Forms are using the tab look, even in creation mode	2015-05-21 21:33:42 +02:00
Laurent Destailleur	3b70013cf9	Merge pull request #2871 from GPCsolutions/dolibarr-2870 ... Dolibarr 2870	2015-05-21 21:24:28 +02:00
Laurent Destailleur	a09563435b	Merge pull request #2840 from FHenry/develop ... NEW : add date value filter on account records list	2015-05-21 21:22:31 +02:00
Francis Appels	793f68dc96	Qual: Remove unused pages ... Remove unused but maintained pages which contain errors and deadlinks.	2015-05-21 20:13:41 +02:00
maxime peyrot	bcb4754585	FIX #2856 : Wrong table design	2015-05-21 17:40:36 +02:00
Alexis Algoud	9184b08f94	FIX button create payment hide if tax amount is less than 1	2015-05-21 16:51:21 +02:00
Raphaël Doursenaud	fc88df9ddf	Fixed typo	2015-05-21 16:33:38 +02:00
Raphaël Doursenaud	38a9f6edae	Drop deprecated fields ... Fix #2870	2015-05-21 16:32:46 +02:00
Arnaud Aujon	6d5555948e	Merge remote-tracking branch 'upstream/develop' into 3.7-webservices-fix ... Conflicts: test/phpunit/WebservicesInvoicesTest.php	2015-05-21 13:11:41 +02:00
Alexis Algoud	bc672c2c23	FIX event for restricted user was restricted if company null	2015-05-21 11:49:10 +02:00
Laurent Destailleur	e075fce5eb	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-05-21 01:33:16 +02:00
Laurent Destailleur	90f9a845ae	Enhance style	2015-05-21 01:32:56 +02:00
aspangaro	e23459d53b	NEW Forms are using the tab look, even in creation mode	2015-05-20 21:50:38 +02:00
Raphaël Doursenaud	a7f6bbd316	Properly escape untrusted data to prevent HTML injection. ... First pass for #2857	2015-05-20 17:34:00 +02:00
Marcos García de La Fuente	9ebae9520a	Extrafields does not form part of this class	2015-05-20 16:46:12 +02:00
Marcos García de La Fuente	e24a8b4505	Closed bug #2843 Wrong SQL table called	2015-05-20 16:43:44 +02:00
Laurent Destailleur	f0cfa3406c	Merge pull request #2852 from aspangaro/develop-resource ... NEW Forms are using the tab look, even in creation mode	2015-05-20 15:27:08 +02:00
Laurent Destailleur	0f89164f4f	Merge pull request #2849 from aspangaro/develop-ER_listlimit ... Fix: ER list don't respect $conf->liste_limit	2015-05-20 15:26:34 +02:00
Laurent Destailleur	a49c6bce66	Merge pull request #2844 from tysauron/patch-3 ... For backward compatibility ON update actioncomm	2015-05-20 15:24:32 +02:00
Laurent Destailleur	4d35939d77	Merge pull request #2850 from aspangaro/develop-adherent ... Members: Review (Add background in create mode / Add button cancel / move type tab in member.lib)	2015-05-20 15:24:09 +02:00
Laurent Destailleur	55b9d97081	Fix PHPCS	2015-05-20 15:22:59 +02:00
Laurent Destailleur	a05510c9df	Merge pull request #2845 from tysauron/patch-2 ... Bug : Declaration of CompanyBankAccount::create() should be compatibl…	2015-05-20 15:19:42 +02:00
Laurent Destailleur	0e837f7540	Merge pull request #2848 from aspangaro/develop-md ... Add pagination style in every template	2015-05-20 15:18:44 +02:00
Florian HENRY	0331ddc2de	fix spacing	2015-05-20 11:30:27 +02:00
Florian HENRY	df4ee9562f	fix spell	2015-05-20 11:29:35 +02:00
Florian HENRY	8fa3b8dac3	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-05-20 11:24:49 +02:00
Florian HENRY	6e6b66e416	apply recommandation from ... ca53d3b602 (commitcomment-11245627)	2015-05-20 11:24:23 +02:00
aspangaro	58e942681d	NEW Forms are using the tab look, even in creation mode	2015-05-20 07:03:17 +02:00
aspangaro	b9bed14afe	Fix: spaces  	2015-05-20 06:38:36 +02:00
aspangaro	de5a15282c	Adherent review	2015-05-20 06:25:43 +02:00
aspangaro	124dbbc2f2	Members: Add background in create mode in type adherent	2015-05-19 22:36:35 +02:00
aspangaro	40b65a642d	Fix: ER list don't respect $conf->liste_limit	2015-05-19 22:22:18 +02:00
Laurent Destailleur	26a74ba3cc	Add constant to allow a module to disable injection scan for its pages.	2015-05-19 22:08:51 +02:00
aspangaro	63b0dbd47b	Add pagination style in every template	2015-05-19 21:59:44 +02:00
Francis Appels	40ef5737fc	Fix: SQL error in facturestats on no view rights ... table alias sc must be available when user has no rights to view customers. see where defenition line 80	2015-05-19 16:34:21 +02:00
tysauron	572269bed1	For backward compatibility ON update actioncomm ... For backward compatibility when val=id ON update actioncomm object	2015-05-19 15:54:08 +02:00
Florian HENRY	ee1aa3268c	working account	2015-05-19 11:55:45 +02:00
tysauron	d29aa083cf	Bug : Declaration of CompanyBankAccount::create() should be compatible with Account::create($user = '')	2015-05-19 11:30:14 +02:00
Laurent Destailleur	62e1c55c97	NEW Introduce function dolGetFirstLineOfText	2015-05-19 00:44:05 +02:00
Laurent Destailleur	03acb1a8c9	Uniformize way to report error after "buildoc" action.	2015-05-19 00:01:30 +02:00
Laurent Destailleur	e2280ce93e	NEW Can close a project that has draft status with no need to switch it ... to validate status before.	2015-05-18 23:49:08 +02:00
Laurent Destailleur	4a70bb7acf	Work on generic usage of get_exdir.	2015-05-18 23:04:49 +02:00
Laurent Destailleur	15c355efc9	A ref field must never be null.	2015-05-18 22:31:14 +02:00
Laurent Destailleur	a258370f8a	Prepare code for generic solution where all path are forged using ... get_exdir.	2015-05-18 22:25:51 +02:00
Laurent Destailleur	4d6b25eb45	Prepare to generalize usage of get_exdir	2015-05-18 21:47:44 +02:00
Laurent Destailleur	6d03ba228d	Fix consistency of backup result message	2015-05-18 20:33:02 +02:00
Laurent Destailleur	e230d72cea	Increase default date range to current month instead of current day	2015-05-18 19:41:23 +02:00
Laurent Destailleur	36cad55ed7	Merge pull request #2829 from bafbes/patch-6 ... NEW Add date filtering into audit page	2015-05-18 19:25:30 +02:00
Francis Appels	28e973331b	Fix: update supplier orderline + rm deprecated prop ... - Fix SQL error in update supplier orderline - Remove deprecated $libelle from product class, $libelle is removed from code and can not be used anymore, no sense to mark deprecated. - Add missing translation key	2015-05-18 18:42:14 +02:00
Alexis Algoud	a4031a3680	if contact in sellist, it's an Id	2015-05-18 18:33:17 +02:00
Florian HENRY	3ef38ab959	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-05-18 13:14:04 +02:00
Florian HENRY	23eac58cc8	fix bug on new feature checkbox list form table	2015-05-18 13:13:50 +02:00
Florian HENRY	a6c5a247cd	add total and title in page records banck account	2015-05-18 11:08:27 +02:00
Laurent Destailleur	7d51779610	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-05-18 11:01:19 +02:00
Laurent Destailleur	e561481f1e	Add option THIRDPARTY_NOTCUSTOMERPROSPECT_BY_DEFAULT and ... THIRDPARTY_NOTCUSTOMERPROSPECT_BY_DEFAULT	2015-05-18 10:58:04 +02:00
Florian HENRY	ca53d3b602	NEW : add date value filter on account records list	2015-05-18 10:43:54 +02:00
Laurent Destailleur	756de27a12	Fix syntax error	2015-05-18 09:11:34 +02:00
Laurent Destailleur	684686e0f6	Fix restore compatibility of new navigation style with jmobile	2015-05-18 08:59:58 +02:00
Laurent Destailleur	f0a1b7984f	More complete test pages	2015-05-18 08:59:25 +02:00
Laurent Destailleur	d25a2af70c	Fix PHPCS	2015-05-17 23:47:15 +02:00
Laurent Destailleur	36d164f779	Add field gender into table of user.	2015-05-17 23:43:57 +02:00
Laurent Destailleur	851007f1a8	Prepare database to manage recurring events	2015-05-17 20:12:49 +02:00
Laurent Destailleur	c89c883d7d	Fix the new navigation style.	2015-05-17 19:37:37 +02:00
Laurent Destailleur	372ad4924b	Add print_barre_liste into prototype.	2015-05-17 18:34:52 +02:00
Bahfir Abbes	1ba2240553	fix add to listevents.php ... use of dol_mktime + check dates order	2015-05-17 16:13:50 +01:00
Laurent Destailleur	fe3f701928	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: ChangeLog build/debian/changelog build/exe/doliwamp/doliwamp.iss htdocs/expedition/list.php htdocs/filefunc.inc.php htdocs/install/mysql/migration/3.6.0-3.7.0.sql htdocs/user/class/user.class.php	2015-05-16 17:09:42 +02:00
Laurent Destailleur	cabbb9e421	Merge remote-tracking branch 'origin/3.5' into 3.6 ... Conflicts: build/debian/changelog build/exe/doliwamp/doliwamp.iss build/makepack-dolibarr.pl build/rpm/dolibarr_fedora.spec build/rpm/dolibarr_generic.spec build/rpm/dolibarr_mandriva.spec build/rpm/dolibarr_opensuse.spec htdocs/filefunc.inc.php	2015-05-16 16:49:03 +02:00
Juanjo Menent	1d3bcc1d81	Insert option to use old system storage photos only if the first ... installation was done with a version < 3.7.0 Conflicts: htdocs/install/mysql/migration/3.6.0-3.7.0.sql	2015-05-16 16:19:51 +02:00
Laurent Destailleur	1d8a3809f0	Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5	2015-05-16 15:27:18 +02:00
Laurent Destailleur	80943111cc	Prepare 3.5.7	2015-05-16 15:26:34 +02:00
Laurent Destailleur	ad7c4a2b52	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-05-16 14:00:09 +02:00
Laurent Destailleur	0e1cf72c43	Fix bad order for firstname, lasname	2015-05-16 13:59:48 +02:00
Laurent Destailleur	4b13d5fafe	Fix css	2015-05-16 03:11:08 +02:00
Laurent Destailleur	58b70f0503	Better translation	2015-05-16 03:07:29 +02:00
Laurent Destailleur	213c918a90	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-05-16 02:53:56 +02:00
Laurent Destailleur	1b03e348d3	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/compta/bank/annuel.php	2015-05-16 02:53:36 +02:00
Laurent Destailleur	e382999b9e	Css fix	2015-05-15 20:10:17 +02:00
Florian HENRY	f29d8aed5b	Fix problem with multicompany on new feature Product propal merge PDF ... product	2015-05-15 17:39:28 +02:00
Florian HENRY	4bc2d55cb3	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-05-15 17:37:31 +02:00
Laurent Destailleur	976211b70f	Look enhancement	2015-05-15 12:53:14 +02:00
Marcos García de La Fuente	e2b2c1c8bd	Merge branch 'develop' into commercial-name ... Conflicts: htdocs/societe/class/societe.class.php	2015-05-15 12:30:03 +02:00
Marcos García de La Fuente	457918c0f7	Merge remote-tracking branch 'upstream/develop' into commercial-name	2015-05-15 11:17:21 +02:00
Laurent Destailleur	c33cbefad2	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-05-15 11:16:29 +02:00
Laurent Destailleur	4931401188	Fix new pagination style was not working correctly.	2015-05-15 04:33:01 +02:00
Laurent Destailleur	7b2230e437	Merge pull request #2774 from aspangaro/develop-pagination ... NEW Use larger button for navigation	2015-05-15 03:57:29 +02:00
Laurent Destailleur	34fb863fc5	Merge pull request #2831 from aspangaro/develop-md ... Md_exp: Deactivate gradient into div.liste_titre & Attenuate lines #ddd -> #f4f4f4	2015-05-15 03:53:23 +02:00
Laurent Destailleur	49a13f5e72	Debug of module expense report	2015-05-15 03:52:29 +02:00
Laurent Destailleur	3f5215169a	Merge branch 'develop-ER_badge' of https://github.com/aspangaro/dolibarr ... into aspangaro-develop-ER_badge Conflicts: htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/expensereport/card.php htdocs/expensereport/class/expensereport.class.php	2015-05-15 02:44:43 +02:00
Laurent Destailleur	bf883e1576	Minor cosmetic changes ... Fix permissions and CRLF	2015-05-15 02:34:57 +02:00
Bahfir Abbes	ffc5284a78	Update listevents.php	2015-05-14 20:17:52 +01:00
Laurent Destailleur	6d95de48c2	Css fixes	2015-05-14 20:49:22 +02:00
Laurent Destailleur	3e94cc07d2	Fight against valign="top". Minor css fixes.	2015-05-14 16:47:15 +02:00
Laurent Destailleur	74607218ea	Fight against key tva_taux. Removed completely.	2015-05-14 15:59:09 +02:00
Laurent Destailleur	33b9d492e2	Clean code	2015-05-14 15:43:07 +02:00
aspangaro	766c58724a	ER: Review & add a totalVAT in pdf	2015-05-14 08:26:41 +02:00
aspangaro	bba0349ab6	ER: traduce code	2015-05-14 07:36:48 +02:00
aspangaro	81cf7a3d25	Merge remote-tracking branch 'Upstream/develop' into develop-md	2015-05-14 06:42:28 +02:00
Juanjo Menent	7c9bb10d6b	Merge pull request #2826 from tysauron/patch-1 ... Update list.php	2015-05-13 21:27:01 +02:00
Juanjo Menent	3d1c0752d3	Merge pull request #2825 from fentman/patch-1 ... Provide NotFound and Error return values	2015-05-13 21:23:56 +02:00
Juanjo Menent	e3e6cff713	Merge pull request #2815 from bafbes/patch-4 ... Fix forgotten last contributor information to list.php Update	2015-05-13 21:16:16 +02:00
Juanjo Menent	d65721bb20	Insert option to use old system storage photos only if the first ... installation was done with a version < 3.7.0	2015-05-13 20:34:57 +02:00
Bahfir Abbes	5191bffb1c	improve events list view ... provide a finer grained view for this list and fix bug related to sorting control which wipes off other parameters	2015-05-13 18:56:13 +01:00
Alexis Algoud	3dc5ffa871	FIX send mail, copy sendto don't read the list of contact	2015-05-13 18:05:26 +02:00
Laurent Destailleur	5937cd7f70	NEW Forms are using the tab look, even in creation mode.	2015-05-13 17:53:25 +02:00
tysauron	84935336ee	Update list.php ... Bug pagination du bas quand recherche	2015-05-13 17:04:35 +02:00
Laurent Destailleur	b327b5fb9d	Save regressions	2015-05-13 09:32:54 +02:00
Laurent Destailleur	43b5209192	NEW Clean code into salary module, debug and add indexes ... NEW Can filter on user list and salary payments on user with naural search.	2015-05-13 08:57:39 +02:00
Laurent Destailleur	8e09f54a46	Minor fixes	2015-05-13 07:46:12 +02:00
Michael Fenton	83e7c8a065	Provide NotFound and Error return values ... Providing a Not Found Message when a Third Party entity is not found to match with details provided, and providing an Error Message when the SQL Lookup fails. This will help Asterisk Users determine whether the CallerID would be usable from Dolibarr or to reject and continue with existing CID from Asterisk	2015-05-13 11:20:06 +10:00
Laurent Destailleur	1af2459d90	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-05-12 23:47:49 +02:00
Laurent Destailleur	b0d73ee674	FIX Bad link to login page into email for password renewal.	2015-05-12 23:47:28 +02:00
Laurent Destailleur	81d2d12035	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-05-12 23:40:57 +02:00
Laurent Destailleur	ce0d728438	Merge pull request #2813 from bafbes/patch-3 ... Update html.formfile.class.php	2015-05-12 23:02:45 +02:00
Laurent Destailleur	39b4fc6455	Renamed readme file	2015-05-12 22:59:17 +02:00
Maxime Kohlhaas	942564be56	Fix : bad link when sorting shipment list #2823	2015-05-12 22:36:34 +02:00
Laurent Destailleur	4408648a68	Merge pull request #2817 from GPCsolutions/jqueryfixes ... jQuery fixes	2015-05-12 22:36:12 +02:00
Laurent Destailleur	b3c9c3d91b	Merge pull request #2818 from GPCsolutions/htmlfixes ... HTML fixes	2015-05-12 22:34:35 +02:00
Laurent Destailleur	b99d2a8276	Merge pull request #2819 from GPCsolutions/typehinting ... [Qual] Typehinting	2015-05-12 22:34:06 +02:00
Florian HENRY	8e61a03b5c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-05-12 21:02:36 +02:00
Raphaël Doursenaud	3b9388e57f	Added typehinting to resultsets in database drivers	2015-05-12 19:51:41 +02:00
Raphaël Doursenaud	6558c0f1f2	Removed a bunch of unused variables	2015-05-12 19:47:15 +02:00
Raphaël Doursenaud	3fdc4ca5e0	Better type hinting for the SQLite3 database driver	2015-05-12 19:45:14 +02:00
Laurent Destailleur	cb6f23d9b6	Merge pull request #2771 from aternatik/api_rest ... Add new core module : REST API	2015-05-12 19:39:37 +02:00
Raphaël Doursenaud	70d36dd1e3	Better type hinting for the SQLite database driver	2015-05-12 19:30:04 +02:00
Raphaël Doursenaud	67641280a4	Fixed parameter types	2015-05-12 19:16:29 +02:00
Raphaël Doursenaud	1fdff27184	Fixed type hintings	2015-05-12 19:11:12 +02:00
Raphaël Doursenaud	053f6ae494	[Qual] Fixed missing return statements	2015-05-12 19:10:47 +02:00
Raphaël Doursenaud	27d52cf2b0	Better type hinting for DoliDB	2015-05-12 19:01:01 +02:00
Raphaël Doursenaud	ccd14c8305	Better type hinting and code structure for the PgSQL database driver	2015-05-12 18:31:12 +02:00
Raphaël Doursenaud	4a01cf1256	Better type hinting for the Database interface	2015-05-12 18:30:16 +02:00
Raphaël Doursenaud	7231ca890a	Better type hinting for the MSSQL database driver	2015-05-12 18:13:24 +02:00
Raphaël Doursenaud	6e6e63db50	Better type hinting and code structure for the MySQLi database driver	2015-05-12 17:56:01 +02:00
Raphaël Doursenaud	04f5e73557	Better type hinting for MySQL database driver	2015-05-12 17:16:46 +02:00
jfefe	125a34cb34	Fix PHPCS	2015-05-12 16:42:35 +02:00
jfefe	d079bc1507	Add comment to ignore PHPCs error due to restler framework	2015-05-12 16:35:05 +02:00
Raphaël Doursenaud	932e23ac09	[Qual] Use jQuery 'is' instead of 'prop' in conditions	2015-05-12 16:21:21 +02:00
Raphaël Doursenaud	aee61aa2c4	[Qual] Fixed deprecated HTML nowrap attribute to class	2015-05-12 15:37:35 +02:00
Raphaël Doursenaud	9b56427858	[Qual] Fixed HTML multiple attribute ... Dolibarr uses HTML 4.01 or HTML5 doctypes. The multiple attribute is boolean.	2015-05-12 15:11:47 +02:00
Raphaël Doursenaud	ce60ae0fcc	[Qual] Fixed HTML readonly attribute ... Dolibarr uses HTML 4.01 or HTML5 doctypes. The readonly attribute is boolean.	2015-05-12 15:09:26 +02:00
Raphaël Doursenaud	d5565fffc1	[Qual] Fixed HTML input form disabled attribute	2015-05-12 15:01:13 +02:00
Raphaël Doursenaud	e149d49fb8	[Qual] Use jQuery property instead of attribute to test and set disabled	2015-05-12 14:53:01 +02:00
Raphaël Doursenaud	0d8641a073	[Qual] Use jQuery property instead of attribute to test and set checked	2015-05-12 14:51:30 +02:00
Marcos García de La Fuente	190f12c4c4	Merge branch '3.5' into bug-2757 ... Conflicts: ChangeLog	2015-05-12 10:16:48 +02:00
Marcos García de La Fuente	ea7eb241e3	Close bug #2757 Deleting product category photo gives "Forbidden access" error	2015-05-12 10:15:43 +02:00
Bahfir Abbes	95a2e65d86	Update list.php ... Fix forgotten last contributor information	2015-05-12 09:01:15 +01:00
Bahfir Abbes	142460ab16	Update html.formfile.class.php ... Fix forgotten last contributor information	2015-05-12 08:53:09 +01:00
Laurent Destailleur	a94121a8c5	Add field to define picto to use for status	2015-05-12 09:42:14 +02:00
aspangaro	304a6936a5	Attenuate lines #ddd -> #f4f4f4	2015-05-12 06:58:29 +02:00
aspangaro	4cb9c3a147	Merge remote-tracking branch 'Upstream/develop' into develop-md	2015-05-12 06:44:41 +02:00
aspangaro	02d7c1cf01	Deactivate Gradient into div.liste_titre	2015-05-12 06:44:14 +02:00
Laurent Destailleur	8075a92d5b	FIX Bad logo for status "Do not contact" of thirdparty.	2015-05-12 02:40:21 +02:00
Laurent Destailleur	973e2253bf	Merge pull request #2797 from hregis/3.6 ... Fix: add $object for use with triggers	2015-05-12 00:14:22 +02:00
Laurent Destailleur	92a25e3d4c	Prepare 3.7.1	2015-05-12 00:11:51 +02:00
Laurent Destailleur	83e4fe5d95	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: build/makepack-dolibarr.pl htdocs/fourn/facture/list.php	2015-05-12 00:09:03 +02:00
Laurent Destailleur	c2b31a37ba	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: build/makepack-dolibarr.pl htdocs/contrat/fiche.php htdocs/core/modules/expedition/modules_expedition.php htdocs/expedition/class/expedition.class.php htdocs/expedition/fiche.php htdocs/user/fiche.php	2015-05-11 23:53:38 +02:00
Laurent Destailleur	2a486f471b	Merge remote-tracking branch 'origin/3.5' into 3.6 ... Conflicts: htdocs/product/class/product.class.php	2015-05-11 23:39:45 +02:00
Laurent Destailleur	ad993f246d	Merge pull request #2795 from hregis/3.7 ... Fix: add $object for use with triggers	2015-05-11 23:36:43 +02:00
Laurent Destailleur	c59e365950	Merge pull request #2812 from bafbes/patch-1 ... Update html.formfile.class.php	2015-05-11 23:08:40 +02:00
Laurent Destailleur	acd7e7502b	Merge pull request #2808 from aspangaro/develop-md ... Theme Md: Change font & divide by two the border-radius	2015-05-11 23:04:11 +02:00
Laurent Destailleur	b2fa603f46	Merge pull request #2794 from hregis/develop_origin ... Fix: add $object for use with triggers	2015-05-11 23:02:41 +02:00
Juanjo Menent	200b3b167e	Merge pull request #2811 from bafbes/patch-2 ... Update list.php and core/class/html.formfile.class.php	2015-05-11 20:16:17 +02:00
Juanjo Menent	23bd8f50df	Merge pull request #2809 from atm-maxime/develop ... New : Signature area on proposal PDF	2015-05-11 20:09:54 +02:00
Juanjo Menent	97b9e87773	Merge pull request #2806 from marcosgdf/revert-25812f0 ... Revert 25812f0	2015-05-11 20:08:15 +02:00
Bahfir Abbes	280c6a04af	Update list.php ... Correct erroneous links to supplier invoice documents in list	2015-05-11 18:03:26 +01:00
Bahfir Abbes	3e4fcd1ac7	Update html.formfile.class.php ... in order to correct document lists in list of supplier invoices	2015-05-11 17:51:54 +01:00
Laurent Destailleur	f275145bd2	FIX We did a test on a permission to export contract when permission did ... not exists.	2015-05-10 23:46:34 +02:00
Laurent Destailleur	1714b8bdbe	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-05-10 23:44:02 +02:00
Laurent Destailleur	8b596d7a69	Fix css missing	2015-05-10 23:43:18 +02:00
Laurent Destailleur	a503d90982	FIX We did a test on a permission to export contract when permission did ... not exists.	2015-05-10 23:37:04 +02:00
Laurent Destailleur	5bac040a9a	Enhance prototype for select	2015-05-10 21:21:29 +02:00
Maxime Kohlhaas	443badfbcf	New : Signature area on proposal PDF	2015-05-10 17:39:57 +02:00
aspangaro	fece843091	Theme Md: Change font & divide by two the border-radius	2015-05-10 15:08:53 +02:00
Marcos García de La Fuente	fb01f89e95	Unwanted deletion	2015-05-10 12:44:36 +02:00
Marcos García de La Fuente	9988b1ad4e	Revert 25812f0	2015-05-10 12:43:21 +02:00
Marcos García de La Fuente	ce7ed70d74	Merge branch 'develop' into commercial-name ... Conflicts: htdocs/comm/prospect/list.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/propale/doc/pdf_azur.modules.php	2015-05-10 12:23:07 +02:00
Marcos García de La Fuente	f6616deef3	Removed debugging function	2015-05-10 01:28:40 +02:00
Marcos García de La Fuente	f8e8b39ff2	FIX #2758 Product::update sets product note to "null" when $prod->note is null	2015-05-10 01:27:28 +02:00
Juanjo Menent	97ad7ca88b	Code fixes	2015-05-09 14:23:26 +02:00
Juanjo Menent	ce1769d2c5	Merge pull request #2803 from simnandez/develop ... Code fixes	2015-05-09 13:59:11 +02:00
Juanjo Menent	e07cebd50b	Merge pull request #2793 from GPCsolutions/htmlfixes ... HTML fixes	2015-05-09 13:58:43 +02:00
Juanjo Menent	27035b42b0	Merge pull request #2788 from GPCsolutions/testaccess ... Change low level access verification to a better high level one	2015-05-09 13:55:17 +02:00
Juanjo Menent	d4e8e58e54	Code fixes	2015-05-09 13:25:40 +02:00
Juanjo Menent	577c872aaf	Code fixes	2015-05-07 20:44:31 +02:00
Juanjo Menent	c5101ae5ea	Code fixes	2015-05-07 20:07:47 +02:00
Florian HENRY	5395465cfd	Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6	2015-05-07 17:24:51 +02:00
Florian HENRY	29f562460a	fix [ bug #1926 ] [contract] Wrong Rights Checked	2015-05-07 17:23:32 +02:00
Raphaël Doursenaud	5d2f081152	[Qual] Fixed HTML select form selected attribute ... Dolibarr uses HTML 4.01 or HTML5 doctypes. The select form selected attribute should not have a value.	2015-05-07 14:21:14 +02:00
Raphaël Doursenaud	b8d9c20731	[Qual] Fixed HTML input form disabled attribute ... Dolibarr uses HTML 4.01 or HTML5 doctypes. The input form disabled attribute should not have a value.	2015-05-07 14:21:14 +02:00
Raphaël Doursenaud	859d1b0df9	[Qual] Fixed HTML input form checked attribute ... Dolibarr uses HTML 4.01 or HTML5 doctypes. The input form checked attribute should not have a value.	2015-05-07 14:21:14 +02:00
Raphaël Doursenaud	c219d4a336	[Qual] Fix form label id reference	2015-05-07 14:21:13 +02:00
Laurent Destailleur	a93ba86ce0	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/commande/card.php htdocs/compta/facture.php htdocs/compta/facture/class/facture.class.php htdocs/core/class/commonobject.class.php htdocs/core/modules/expedition/modules_expedition.php htdocs/core/modules/modContrat.class.php htdocs/expedition/class/expedition.class.php	2015-05-07 13:35:09 +02:00
Laurent Destailleur	afc487ef9d	Fix phpcs	2015-05-07 13:28:03 +02:00
Juanjo Menent	f993920d67	Commenting function	2015-05-07 13:23:00 +02:00
Laurent Destailleur	971e23e006	Fix special_code was lost when updating line	2015-05-07 12:10:27 +02:00
Regis Houssin	5578151bad	Fix: add $object for use with triggers	2015-05-07 12:08:02 +02:00
Regis Houssin	85244ba8c9	Fix: add $object for use with triggers	2015-05-07 12:06:17 +02:00
Regis Houssin	9a32d7ec2f	Fix: add $object for use with triggers	2015-05-07 12:02:24 +02:00
Laurent Destailleur	f197a94f59	Fix duplicate log	2015-05-07 10:52:41 +02:00
Laurent Destailleur	cc5968fbd5	A more complete error message	2015-05-07 10:45:35 +02:00
Raphaël Doursenaud	040df3c922	Change low level access verification to a better high level one	2015-05-07 10:32:20 +02:00
Laurent Destailleur	b71e5a1025	Merge pull request #2673 from aternatik/fix_getentity ... Fix : missing getEntity calls	2015-05-07 00:48:19 +02:00
Juanjo Menent	2707dcd283	Code fixes	2015-05-06 23:44:53 +02:00
Laurent Destailleur	36ebaf7a22	Clean code	2015-05-06 23:31:03 +02:00
Laurent Destailleur	b601a87a2a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-05-06 23:13:52 +02:00
Juanjo Menent	652ff9e67c	Commenting function	2015-05-06 23:13:33 +02:00
Laurent Destailleur	3a8cf17f3c	NEW Can edit list of prospect status for customers/prospects. Add a new ... entry into dictionary table to manage list fo status. Removed deprecated files.	2015-05-06 23:13:07 +02:00
fmarcet	e191fc41a3	FIX: Bug on order and supplier invoice numeration mask when use supplier ... code	2015-05-06 21:39:06 +02:00
Juanjo Menent	7adbf033df	Merge pull request #2759 from fmarcet/3.7 ... FIX: Bug on order and supplier invoice numeration mask when use supplier	2015-05-06 21:37:15 +02:00
Maxime Kohlhaas	1cb7d284a5	Fix : shipment PDF was not using generation params ... Conflicts: htdocs/core/modules/expedition/modules_expedition.php htdocs/expedition/fiche.php	2015-05-06 21:29:58 +02:00
Maxime Kohlhaas	72c4337f4b	Fix : shipment PDF was not using generation params ... Conflicts: htdocs/core/modules/expedition/modules_expedition.php htdocs/expedition/fiche.php	2015-05-06 21:18:31 +02:00
Juanjo Menent	33f98a4433	Merge pull request #2776 from aspangaro/develop-accountancy_patch1 ... Accountancy: add a button to purge search criteria on list	2015-05-06 20:53:46 +02:00
Juanjo Menent	ea95a461e2	Fix: Make propal pdf "azur" compatible with the two products images ... storage system on use MAIN_GENERATE_PROPOSALS_WITH_PICTURE	2015-05-06 17:17:41 +02:00
Laurent Destailleur	e6e263d13f	Add field to manage reccuring events	2015-05-06 16:44:41 +02:00
Laurent Destailleur	8efe0143f9	FIX Adding 5 more choice link into survey module was not working with ... chrome	2015-05-06 16:37:04 +02:00
Maxime Kohlhaas	42455f771a	Missing comments	2015-05-06 12:43:41 +02:00
Maxime Kohlhaas	d2603d5308	Fix : shipment was not considered as billed after classifybilled function	2015-05-06 12:39:10 +02:00
Maxime Kohlhaas	b203263e91	Fix : shipment PDF was not using generation params	2015-05-06 12:16:36 +02:00
jfefe	e5f0ab9324	Missing required class	2015-05-06 01:39:28 +02:00
jfefe	d62d7a2fc7	PHPCS again	2015-05-06 01:25:56 +02:00
jfefe	24bf614061	Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into api_rest ... Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-05-06 01:00:11 +02:00
jfefe	dbb9449ee7	Fix PHPCS	2015-05-06 00:55:42 +02:00
Laurent Destailleur	db63a9783e	More responsive design	2015-05-06 00:29:39 +02:00
aspangaro	10a895f1bd	Accountancy: add a button to purge search criteria on list	2015-05-05 22:36:48 +02:00
Laurent Destailleur	4ce4529cd5	Revert "Remove useless variables for common object" ... This reverts commit 82682dfc66.	2015-05-05 22:09:58 +02:00
Laurent Destailleur	a4675010ac	Fix label	2015-05-05 22:08:53 +02:00
Laurent Destailleur	0410f29e81	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-05-05 21:59:06 +02:00
Laurent Destailleur	b0baed83fc	Prepare for email tracking	2015-05-05 21:50:48 +02:00
aspangaro	d06f1db7d0	Merge remote-tracking branch 'Upstream/develop' into develop-pagination	2015-05-05 21:42:34 +02:00
aspangaro	f092be58c8	New: Add visual pagination for use on tablet	2015-05-05 21:41:08 +02:00
Arnaud Aujon Chevallier	da8aaea343	Merge remote branch 'upstream/3.7' into 3.7-webservices-fix	2015-05-05 21:37:50 +02:00
Arnaud Aujon Chevallier	4fd8d6c05a	fix typo	2015-05-05 21:37:10 +02:00
Raphaël Doursenaud	b91d1fa0ca	dol_delete_files(): removed unused variables	2015-05-05 21:15:53 +02:00
Raphaël Doursenaud	7b542731a1	Made test pessimistic by default ... The test result was wrong if, for example, the path was wrong. The unlink() function being never called, it returned the default true value even if it didn't remove a file.	2015-05-05 21:15:53 +02:00
Juanjo Menent	dc01de8072	Merge pull request #2765 from aternatik/common_properties ... Remove useless variables for common object	2015-05-05 20:27:52 +02:00
Juanjo Menent	f6d2320c34	Merge pull request #2756 from aternatik/fix_label_product ... FIX : remove deprecated property 'libelle' on product object	2015-05-05 20:25:08 +02:00
Juanjo Menent	65d736cb68	Merge pull request #2766 from aternatik/fix_product_cat ... Fix : missing link to category into product card.	2015-05-05 20:17:17 +02:00
Juanjo Menent	75fe8af5dc	Merge pull request #2770 from GPCsolutions/dolibarr-2769 ... Added missing translation of categories' "Translation" tab	2015-05-05 20:04:13 +02:00
Laurent Destailleur	f97d81701b	Add an exit to avoid to have apache hangs.	2015-05-05 13:46:28 +02:00
jfefe	3b1f6e8a5a	Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into api_rest	2015-05-05 12:56:10 +02:00
Laurent Destailleur	467ee7b771	Fix error into export filter step ... Conflicts: htdocs/core/modules/modCommande.class.php htdocs/core/modules/modContrat.class.php htdocs/core/modules/modFournisseur.class.php	2015-05-05 12:45:38 +02:00
jfefe	5f62d2b13e	Add API class for invoice	2015-05-05 12:42:57 +02:00
jfefe	db5a2bacd1	Bad sort field	2015-05-05 12:42:56 +02:00
jfefe	638c534211	Modify API explorer settings to memorize api key	2015-05-05 12:42:56 +02:00
jfefe	289b847eb4	Add API class for orders	2015-05-05 12:42:56 +02:00
jfefe	0012cd8131	Fix API category class	2015-05-05 12:42:56 +02:00
jfefe	967e8c66a9	Add method to get each type of category with a specific uri	2015-05-05 12:42:55 +02:00
jfefe	0e4a06799d	Add API class for categories	2015-05-05 12:42:55 +02:00
Laurent Destailleur	c665bfa3ee	Fix error into export filter step	2015-05-05 12:39:27 +02:00
Raphaël Doursenaud	2ff0cebbf7	Added missing translation of categories' "Translation" tab ... Fix #2769	2015-05-05 11:24:04 +02:00
Laurent Destailleur	409e74facd	Missing translation	2015-05-05 11:10:13 +02:00
Laurent Destailleur	4d34f473f6	Won another space line	2015-05-05 11:07:28 +02:00
Arnaud Aujon Chevallier	d020c4133a	webservice_order : return all necessary fields	2015-05-05 10:26:05 +02:00
Arnaud Aujon Chevallier	8b753dc743	fix typo	2015-05-05 10:05:13 +02:00
Laurent Destailleur	1e8b148e4b	Work on tracking id into emails	2015-05-05 04:10:42 +02:00
jfefe	e698c3b64a	Fix into category edit page ... Rename $nom into $label Add missing html class to show description as required	2015-05-05 01:43:39 +02:00
jfefe	3d8f692355	Fix : missing link to category into product card.	2015-05-05 01:34:50 +02:00
jfefe	82682dfc66	Remove useless variables for common object ... Fields name / civility / ... are nonsense for a lot of objects into Dolibarr. They could be defined for each object instead of into the common object class. This for the API which exposes a property civility for a category :\	2015-05-05 01:13:49 +02:00
Laurent Destailleur	2caf137ea0	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-05-04 22:05:21 +02:00
Laurent Destailleur	9b55bedf66	FIX bad calculation for stock value	2015-05-04 22:04:58 +02:00
Laurent Destailleur	c89c89c73e	Mutualise code and some fixes for stock management.	2015-05-04 22:02:54 +02:00
Laurent Destailleur	47e99d82a4	Fix css	2015-05-04 13:36:33 +02:00
Laurent Destailleur	f84ea6f960	Uniformize code of boxes	2015-05-04 13:10:45 +02:00
jfefe	a1cc47f81b	Missing rename product field libelle into label	2015-05-04 12:58:54 +02:00
Laurent Destailleur	e73526b29c	Fix prospect box must use the getNomUrl method	2015-05-04 12:42:45 +02:00
jfefe	3a1b7d6530	Missing renaming fields	2015-05-04 12:37:50 +02:00
jfefe	561d5e82c1	Rename libelle product field into label	2015-05-04 12:33:38 +02:00
Laurent Destailleur	90f78429ec	Fix regression after renaming field fk_soc	2015-05-04 12:29:26 +02:00
Laurent Destailleur	4f4ebfaed3	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/printipp/admin/printipp.php	2015-05-04 12:09:39 +02:00
Laurent Destailleur	a18e3c7813	Fix correct id of core modules	2015-05-04 12:02:09 +02:00
Laurent Destailleur	ac4bd7d441	Uniformize code	2015-05-04 11:41:30 +02:00
Arnaud Aujon	d27934419c	fix log	2015-05-04 11:36:53 +02:00
Arnaud Aujon	d8027bd71d	add thirdparty_id to get invoice	2015-05-04 11:36:40 +02:00
Laurent Destailleur	b554d81314	Better translation	2015-05-04 10:47:26 +02:00
Arnaud Aujon	ef08283bbd	Merge branch '3.7-webservices-fix' of https://github.com/aaujon/dolibarr into 3.7-webservices-fix	2015-05-04 10:36:17 +02:00
Laurent Destailleur	89c9996b22	Fix translation of status	2015-05-04 09:50:49 +02:00
fmarcet	077a9c6510	FIX: Bug on order and supplier invoice numeration mask when use supplier ... code	2015-05-04 09:22:55 +02:00
jfefe	7e0357dcf9	FIX : remove deprecated property 'libelle' on product object	2015-05-04 03:03:24 +02:00
jfefe	5c7f7f6d6e	Add API readme	2015-05-04 02:32:24 +02:00
jfefe	18def27eb6	Change API route for thirdparties lists ... Use /thirdparty/list instead of /thirdparties/	2015-05-04 01:31:23 +02:00
jfefe	cd37d3eb11	Add API class for product	2015-05-04 01:17:41 +02:00
jfefe	0673e3a1f1	Fix API lists method for thirdparty and contact	2015-05-04 00:33:44 +02:00
jfefe	53f480708f	Merge branch 'develop' into api_restler	2015-05-03 23:43:13 +02:00
Laurent Destailleur	877511717b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-05-03 21:35:09 +02:00
Laurent Destailleur	0ba2ae6d32	Some fix in css	2015-05-03 21:31:09 +02:00
Laurent Destailleur	4f9af75afa	Merge pull request #2723 from ndrosis/patch-17 ... hide password	2015-05-03 21:20:31 +02:00
Laurent Destailleur	8a7728f193	Merge pull request #2752 from fappels/develop-tcpdfbarcode ... NEW add tcpdf barcode generator and printing, add 2d Datamatrix and QRcode CLOSE #2655	2015-05-03 21:19:01 +02:00
Laurent Destailleur	a566ec3ace	Merge pull request #2755 from aternatik/company_delete ... Modify thirdparty delete() method to pass user object as an argument.	2015-05-03 21:18:38 +02:00
Laurent Destailleur	8b85d17a51	Merge pull request #2753 from aspangaro/develop-ER_badge ... Review ER: Add filter on amounts & correct search mode who doesn't work & typo	2015-05-03 21:17:18 +02:00
Laurent Destailleur	333a29683c	uniformize look	2015-05-03 21:15:08 +02:00
jfefe	8fd03fa87e	Add API class for contacts	2015-05-03 21:12:18 +02:00
Laurent Destailleur	c485b1fe30	Fix When generation of doc is required and generator not provided, we ... take first entry found.	2015-05-03 20:07:16 +02:00
jfefe	60d6cc5806	Modify search of API classes for module ... A module can now bring several API classes. By example, thirdparty module can have api_thirdparty.class.php for thirdparty and api_contact.class.php for contacts. Classes must be named <Object>API (ie ThirdpartyApi or ContactApi)	2015-05-03 19:43:49 +02:00
jfefe	80b832e90c	Add API methods to retrieve customers, prospects and others	2015-05-03 19:13:14 +02:00
jfefe	0d14cb8709	Modify thirdparty delete() method to pass user object as an argument.	2015-05-03 18:44:42 +02:00
jfefe	a8ee123bb2	Add API methods to create, update and delete a thirdparty	2015-05-03 18:30:59 +02:00
jfefe	64d0a710f7	API tirdparties list	2015-05-03 16:59:47 +02:00
Laurent Destailleur	f0b10c14d7	NEW Add a new component to select categories/tags from the main edit ... page of product. The dedicated tab is also removed.	2015-05-03 15:51:55 +02:00
Laurent Destailleur	984aca28c3	Sync translation	2015-05-03 15:37:15 +02:00
jfefe	2ea8c90fe2	Module descriptor for API module	2015-05-03 14:53:40 +02:00
jfefe	47c3724f3d	Verify API access by user to resource ... API authentication mechanism is supposed to be working with internal or external users	2015-05-03 14:44:37 +02:00
jfefe	46ce77c571	Refactor function to use it into API ... New function checkUserAccessToObject() is a piece of restrictedArea() function.	2015-05-03 14:41:51 +02:00
aspangaro	c502dabd76	Merge remote-tracking branch 'Upstream/develop' into develop-ER_project	2015-05-03 14:31:15 +02:00
aspangaro	c6306260c5	Fix: ER Search mode doesn't work	2015-05-03 14:25:37 +02:00
aspangaro	da272c6aac	ER Typo	2015-05-03 14:24:20 +02:00
Laurent Destailleur	0479bd5a59	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/contrat/card.php htdocs/contrat/class/contrat.class.php htdocs/core/class/extrafields.class.php htdocs/core/modules/modAdherent.class.php	2015-05-03 13:00:39 +02:00
Francis Appels	2b32dc4ba8	Apply correct tabulation	2015-05-03 11:51:54 +02:00
Francis Appels	cb75d0778a	Fix doc errors	2015-05-03 11:09:33 +02:00
Juanjo Menent	6b9d5be3c2	Merge pull request #2745 from frederic34/patch-9 ... Typo	2015-05-03 11:01:32 +02:00
Juanjo Menent	edbef3d1da	Merge pull request #2746 from frederic34/patch-10 ... Typo	2015-05-03 11:01:17 +02:00
Juanjo Menent	3966b6dfde	Merge pull request #2747 from aspangaro/develop-accountancy_patch1 ... Accountancy - Add key language & prepare journal for expense report	2015-05-03 11:00:48 +02:00
Francis Appels	fee4c4e0e2	Fix: add newline at eof	2015-05-03 10:26:12 +02:00
Francis Appels	f9ece24f95	Fix: Member card header/footer text	2015-05-03 10:09:31 +02:00
Francis Appels	ffe7671549	Fix label L7163 X spacing	2015-05-03 10:08:32 +02:00
Francis Appels	f9908c48cb	Add datamatrix en qrcode barcodes	2015-05-03 10:07:04 +02:00
Francis Appels	96dfdfeb73	New tcpdf barcode label printing class ... New tcpdf barcode label printing class and add parameters to printsheet for using this class. Add parameter to modules_xxx.php functions to pass printing templete class to use	2015-05-03 10:05:59 +02:00
Francis Appels	701c85620b	Extend sticker classes from abstract class ... Extend member and printsheet sticker printer classes from new abstract commonsticker generator	2015-05-03 10:00:11 +02:00
Francis Appels	2fd4bf1012	Add commonstickergenerator class ... Common abstract class for sticker printing. Creates contracts for write_file and addSticker methods	2015-05-03 09:54:37 +02:00
aspangaro	be302ce5ae	New: ER Add filter on amounts	2015-05-03 08:10:22 +02:00
aspangaro	55eecf3f25	ER add price format in total of list	2015-05-03 07:05:19 +02:00
aspangaro	6dfd125872	Spaces 4 : Stop Shouting !	2015-05-03 06:25:50 +02:00
aspangaro	7062dc7b2e	Spaces 3 : the darkside	2015-05-03 06:20:34 +02:00
aspangaro	3a5f6db571	Spaces 2 : return of the vilains	2015-05-03 06:18:21 +02:00
aspangaro	9aa336e0d0	Spaces !!!	2015-05-03 06:16:28 +02:00
aspangaro	8163563753	New: Add option to show long or short (by default) label in select_month()	2015-05-03 06:12:02 +02:00
jfefe	31e5b4786a	Fix : verify access method ... Now we can use tag '@class' into PHPDoc block of method or class. By example: @class DolibarrApiAccess {@requires user,external}	2015-05-03 01:54:04 +02:00
jfefe	fa494369b8	New : API key authentication ... One key is stored by user when login API method is called. Each API request must have api_key parameter	2015-05-02 23:54:35 +02:00
jfefe	8027759304	Work on authentication	2015-05-02 18:14:51 +02:00
jfefe	65ff78f61a	Don't expose API if module disabled	2015-05-02 15:31:21 +02:00
jfefe	4ccb04590e	Add API admin page	2015-05-02 15:27:19 +02:00
jfefe	4bce903c63	Add field into user table to store API key	2015-05-02 15:26:45 +02:00
jfefe	23e423404b	Add API htaccess file for Apache webserver	2015-05-02 15:25:48 +02:00
aspangaro	315e9239ac	Merge remote-tracking branch 'Upstream/develop' into develop-accountancy2	2015-05-02 06:45:53 +02:00
aspangaro	1174c67b07	Accountancy - Add key language & prepare journal for expense report	2015-05-02 06:42:06 +02:00
Frédéric FRANCE	d8af7a45f8	Typo	2015-05-01 19:10:47 +02:00
Frédéric FRANCE	e3f980e32c	Typo	2015-05-01 18:44:27 +02:00
Juanjo Menent	6f6ff6697a	Merge pull request #2742 from aspangaro/develop-ER_badge ... New: ER add badge on tab document	2015-05-01 16:24:47 +02:00
Juanjo Menent	300d6532a1	Merge pull request #2740 from aspangaro/develop-devcamp ... Fix: ER Typo on variable $_SERVER, correct Link & traduce button	2015-05-01 16:24:32 +02:00
jfefe	1536cd430d	Missing PHPDOC for REST API working for thirdparties ... These tags are very important for REST API. Please have a look at https://github.com/Luracast/Restler/blob/master/ANNOTATIONS.md	2015-05-01 16:16:31 +02:00
jfefe	d406830e06	NEW : add an explorer for REST API consultation & documentation	2015-05-01 16:13:58 +02:00
jfefe	30c901c266	Begin REST API implementation with thirdparty classes and methods needed. ... Work in progress !	2015-05-01 16:12:30 +02:00
Raphaël Doursenaud	31a8e38d37	Allow exporting projects without a third party ... FIX #2729 Conflicts: htdocs/core/modules/modProjet.class.php	2015-05-01 16:01:57 +02:00
Raphaël Doursenaud	93937fe7f3	Allow exporting projects without a third party ... FIX #2729	2015-05-01 15:58:36 +02:00
Raphaël Doursenaud	a6b0f6cfac	Allow exporting projects without a third party ... FIX #2729	2015-05-01 15:56:39 +02:00
jfefe	b503b16f07	NEW : add restler framework ... First step to build REST API into Dolibarr	2015-05-01 15:42:05 +02:00
aspangaro	b0eee2976c	New: ER add badge on tab document	2015-05-01 08:46:37 +02:00
aspangaro	b03a9dffeb	Fix : ER Correct Link	2015-05-01 07:18:19 +02:00
aspangaro	95058607a4	Fix : ER Typo on all variable $_SERVER & traduce of button "Edit" not works	2015-05-01 07:13:04 +02:00
Juanjo Menent	29c9686b8e	Merge pull request #2730 from GPCsolutions/dolibarr-2718 ... Export task labels	2015-04-30 21:02:17 +02:00
Juanjo Menent	40be94452d	Merge pull request #2734 from GPCsolutions/unitfix ... Fix missing unit parameter	2015-04-30 20:54:00 +02:00
Juanjo Menent	4a4630a4a3	Merge pull request #2735 from GPCsolutions/dolibarr-2632 ... Add sensible default mode to directory creation	2015-04-30 20:51:37 +02:00
Juanjo Menent	91767edd05	Fixed SQL table reference for members types in export	2015-04-30 20:50:05 +02:00
Raphaël Doursenaud	afc582a369	Fixed SQL table reference for members types in export ... FIX #2712	2015-04-30 17:20:53 +02:00
Francis Appels	f762d6d7cb	Add tcpdfbarcode ... Add modTcpdfbarcode class Add pdf_label class pdf_standardlabel extends pdf_label	2015-04-30 16:41:52 +02:00
Raphaël Doursenaud	2c44aa6742	Add sensible default mode to directory creation ... Fix #2632	2015-04-30 16:22:01 +02:00
Raphaël Doursenaud	7b538d8842	Fix missing unit parameter ... Prevented the input of supplier invoices lines from working	2015-04-30 15:59:20 +02:00
Raphaël Doursenaud	f1032baaab	Allow exporting projects without a third party ... FIX #2729	2015-04-30 11:48:32 +02:00
Raphaël Doursenaud	2058d21da9	Export task labels ... FIX #2718	2015-04-30 11:43:42 +02:00
Laurent Destailleur	6b3c060d9c	Fix doxygen	2015-04-30 00:07:30 +02:00
Laurent Destailleur	43efd76b24	Fix remove warnings	2015-04-29 23:39:34 +02:00
Laurent Destailleur	290856db1c	Fix remove warning	2015-04-29 22:37:04 +02:00
Laurent Destailleur	060d8a1a38	FIX Ref/label of product on contract line was not visible, nor into ... page, nor into PDF.	2015-04-29 19:57:01 +02:00
Laurent Destailleur	83daa67cc6	FIX Description of contract line was not visible.	2015-04-29 19:15:14 +02:00
Laurent Destailleur	53bf90a3e2	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: ChangeLog	2015-04-28 21:54:13 +02:00
Laurent Destailleur	b0071a7c6c	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/main.inc.php	2015-04-28 21:14:17 +02:00
Laurent Destailleur	1a70e9c5f9	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-04-28 21:12:38 +02:00
Laurent Destailleur	b30ee6b3fa	Better fix for #2725	2015-04-28 21:12:04 +02:00
Drosis Nikos	524a535f6d	hide password	2015-04-28 16:34:03 +03:00
Juanjo Menent	6cfd8d64f5	Change bugtracker to github in all maintened versions	2015-04-27 20:34:52 +02:00
Juanjo Menent	cfaaf56428	Change bugtracker to github in all maintened versions	2015-04-27 20:34:26 +02:00
Juanjo Menent	ebe1f4a74d	-Activate const PRODUCT_USE_OLD_PATH_FOR_PHOTOS by default for old ... instances -Update changelog for 3.7.1 Conflicts: ChangeLog htdocs/install/mysql/migration/3.6.0-3.7.0.sql	2015-04-27 20:31:12 +02:00
Laurent Destailleur	416e34d50d	Fix error management	2015-04-27 20:26:56 +02:00
Laurent Destailleur	f9a428d550	Fixed #2714	2015-04-27 20:25:02 +02:00
Laurent Destailleur	b619c64770	Fix #2713	2015-04-27 20:24:02 +02:00
Juanjo Menent	93024830f5	-Activate const PRODUCT_USE_OLD_PATH_FOR_PHOTOS by default for old ... instances -Update changelog for 3.7.1	2015-04-27 20:22:03 +02:00
fmarcet	1c01e187c1	Fix: Bug in the new photo system	2015-04-27 17:20:10 +02:00
fmarcet	99c4508029	Fix: Bug in the new photo system	2015-04-27 16:44:12 +02:00
Laurent Destailleur	50a6c133c9	Fix error management	2015-04-27 11:46:30 +02:00
Laurent Destailleur	92f2c48475	Fixed #2714	2015-04-27 11:46:08 +02:00
Laurent Destailleur	ce05837237	Translation	2015-04-27 09:55:59 +02:00
Laurent Destailleur	2e05a4f1be	Fix #2713	2015-04-27 03:21:55 +02:00
Laurent Destailleur	aa9bffe5c9	Fix translation	2015-04-27 02:34:15 +02:00
Laurent Destailleur	4e04f75c66	Fix css	2015-04-27 02:33:44 +02:00
Laurent Destailleur	5b3b180c10	NEW Web service to create or update product can correct stock during ... creation/update.	2015-04-27 01:36:13 +02:00
Laurent Destailleur	1e237defb0	Fix phpcs	2015-04-26 17:59:02 +02:00
Laurent Destailleur	4235d74aac	Fix tests for ES	2015-04-26 16:45:24 +02:00
Laurent Destailleur	414404e854	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/comm/action/class/actioncomm.class.php htdocs/core/class/commonobject.class.php	2015-04-26 16:30:33 +02:00
Laurent Destailleur	7b9d9c4d0a	Fix lang	2015-04-26 16:25:02 +02:00
Laurent Destailleur	025d8c2a71	Clean script migration	2015-04-25 23:22:44 +02:00
Laurent Destailleur	7c706ebaf6	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-25 23:15:55 +02:00
Laurent Destailleur	60a56da370	Some change into css. Tabs background are now white so main content is ... black on white (better contrast). Fix editfieldval for date.	2015-04-25 22:20:10 +02:00
Arnaud Aujon	4e10b94b6b	Add webservice method createInvoiceFromOrder	2015-04-25 00:38:32 +02:00
Arnaud Aujon	fa9cb49fcb	add updateInvoice webservice call	2015-04-24 23:42:35 +02:00
Arnaud Aujon	918d59b0d4	fix updateOrder result values	2015-04-24 23:41:54 +02:00
Arnaud Aujon	13cfae2eb6	payment_mode_id should be in Invoice not InvoiceLine	2015-04-24 23:02:59 +02:00
Arnaud Aujon	c0506918b6	Merge remote-tracking branch 'upstream/3.7' into 3.7-webservices-fix	2015-04-24 21:34:57 +02:00
Laurent Destailleur	13b4d86064	Better fix for #2709	2015-04-24 21:29:02 +02:00
Laurent Destailleur	d925e552ca	Merge pull request #2709 from atm-alexis/3.7 ... FIX event not linked to contact on creation	2015-04-24 21:23:50 +02:00
Laurent Destailleur	5a509940f3	Merge pull request #2706 from GPCsolutions/mobiledetect ... Mobiledetect	2015-04-24 21:22:56 +02:00
Laurent Destailleur	a091158cce	Merge pull request #2690 from open-minds/develop ... Add sorting for extra fields values	2015-04-24 21:10:27 +02:00
Laurent Destailleur	de74bbed3a	Merge pull request #2702 from atm-gauthier/3.7 ... FIX : display linked object in edit mode when we create an event from an...	2015-04-24 21:10:02 +02:00
Laurent Destailleur	788ec8cd88	Merge pull request #2698 from fappels/3.7 ... FIX: can show print page after product save	2015-04-24 21:08:20 +02:00
Laurent Destailleur	125c821bc4	add comment	2015-04-24 20:47:45 +02:00
Alexis Algoud	7d3482036d	FIX event not linked to contact on creation	2015-04-24 17:40:53 +02:00
Laurent Destailleur	6dab9f0283	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-24 10:59:41 +02:00
Laurent Destailleur	576cd57a94	NEW Can edit internal label of invoice even when closed (this is a ... private information)	2015-04-24 10:59:18 +02:00
Laurent Destailleur	e0d2c43086	fix phpcs	2015-04-24 01:15:29 +02:00
Laurent Destailleur	d47b9a759a	FIX migration error	2015-04-24 00:33:02 +02:00
Raphaël Doursenaud	7281ea21e6	Qual: moved mobiledetect external library ... External libraries resides in the include directory	2015-04-23 20:30:33 +02:00
Raphaël Doursenaud	f07c174c9c	FIX: moved built-in bug report system to GitHub Issues ... Improved environment informations and presentation	2015-04-23 18:43:32 +02:00
Gauthier	58008cef94	NEW : display linked object in edit mode when we create an event from an order, propal...	2015-04-23 16:28:29 +02:00
Laurent Destailleur	94ff635cc2	NEW Add filter on user contact or user task into task list	2015-04-23 16:20:25 +02:00
Laurent Destailleur	0e141f2c1b	Fix css	2015-04-23 15:35:32 +02:00
Laurent Destailleur	4f3fe82e93	NEW Add filter on task ref and task label into list of tasks	2015-04-23 15:22:50 +02:00
Laurent Destailleur	1fcf10fd8a	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-04-23 13:55:08 +02:00
Laurent Destailleur	c97c5e0cfd	Fix selection of user was lost	2015-04-23 13:54:49 +02:00
Laurent Destailleur	7fd2247297	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-23 13:45:02 +02:00
Laurent Destailleur	f9285d6d23	NEW Can add all user of a project as user of a task, in one step.	2015-04-23 13:44:45 +02:00
aspangaro	f4e346c75b	Merge remote-tracking branch 'Upstream/develop' into develop-Devcamp	2015-04-23 07:30:20 +02:00
aspangaro	3ae8428a12	New: Add search field for value date in vat payment list	2015-04-23 07:26:09 +02:00
Juanjo Menent	f7ab53be8e	Fix test for es. Dumps 3.5 et 3.6	2015-04-22 23:40:43 +02:00
Juanjo Menent	1ed573f98b	Fix: #2694 Bug: Warning: Invalid argument supplied for foreach() in ... commande.class.php on line 852	2015-04-22 23:31:24 +02:00
Francis Appels	93d9321088	FIX: can show print page after product save ... Add product id to form action to be able show print page from product card after save.	2015-04-22 23:27:09 +02:00
Laurent Destailleur	305030ae6c	Fix test to match new field names of note	2015-04-22 21:58:12 +02:00
Laurent Destailleur	807824aaad	Fix warnings	2015-04-22 21:48:59 +02:00
Laurent Destailleur	47ecb91a3e	Avoid DOS attack when high number of tasks	2015-04-22 21:17:49 +02:00
Laurent Destailleur	be4ad5460e	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-22 20:28:43 +02:00
Laurent Destailleur	9ef809e91b	Fix migration tools	2015-04-22 20:28:21 +02:00
Laurent Destailleur	7f5377d219	Fix #2695	2015-04-22 19:25:20 +02:00
Laurent Destailleur	b57d3ddf03	Merge pull request #2695 from Ankapi/develop ... Fixed hook "pdfgeneration" in the pdf blochet of cheque deposit	2015-04-22 19:24:40 +02:00
Laurent Destailleur	100fa1067e	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/compta/bank/virement.php htdocs/compta/facture/impayees.php htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/core/menus/standard/eldy.lib.php htdocs/core/modules/modProjet.class.php htdocs/install/mysql/migration/3.6.0-3.7.0.sql htdocs/langs/en_GB/admin.lang htdocs/langs/es_AR/orders.lang htdocs/langs/es_AR/trips.lang htdocs/langs/es_CO/admin.lang htdocs/langs/es_CO/orders.lang htdocs/langs/es_CO/trips.lang htdocs/langs/fr_FR/admin.lang htdocs/langs/fr_FR/main.lang htdocs/langs/pl_PL/interventions.lang htdocs/langs/pt_BR/trips.lang htdocs/langs/ro_RO/productbatch.lang htdocs/langs/ro_RO/trips.lang htdocs/main.inc.php htdocs/projet/element.php	2015-04-22 17:57:57 +02:00
Laurent Destailleur	9279a3a349	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-22 17:39:33 +02:00
Laurent Destailleur	208ac31bf8	Fix test for es	2015-04-22 17:39:09 +02:00
David Avigni (Ankapi)	e298bd0a68	Fixed hook "pdf generation", executeHooks misnamed: replacement ... "adterPDFCreation" with "afterPDFCreation"	2015-04-22 15:23:52 +02:00
Laurent Destailleur	12d841f27d	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-04-22 14:58:39 +02:00
Laurent Destailleur	3d609d5fd0	Sync transifex	2015-04-22 14:58:06 +02:00
Arnaud Aujon	97fc99517e	Fixes : contact webservice fix update using ref_ext	2015-04-22 12:47:45 +02:00
Arnaud Aujon	54ffaea000	Merge remote-tracking branch 'upstream/3.7' into 3.7-webservices-fix	2015-04-22 12:33:53 +02:00
Frédéric FRANCE	768fdde2d1	Update product.class.php	2015-04-22 10:39:32 +02:00
aspangaro	b35c929cad	Merge remote-tracking branch 'Upstream/develop' into develop-Devcamp	2015-04-22 07:18:52 +02:00
aspangaro	560150fd1c	Fixed: For salaries in bank module : missing language file & simplify thidparty column (Informations are truncated by default)	2015-04-22 07:15:17 +02:00
Laurent Destailleur	f3ea694b97	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-22 00:17:24 +02:00
Laurent Destailleur	5b758e0e16	Fix migration process	2015-04-22 00:17:03 +02:00
Laurent Léonard	e0cc007487	Add sorting for extra fields values	2015-04-21 20:21:24 +02:00
Juanjo Menent	b9b21bce8a	Merge pull request #2679 from marcosgdf/bug-1786-2 ... FIX [ bug #1786 ] Spanish localtax2 calculation errors with corrective invoices	2015-04-21 18:52:56 +02:00
Laurent Destailleur	bce952fa9b	Fix bad link	2015-04-21 17:06:13 +02:00
Laurent Destailleur	96a33bbe8a	First clean of code after devcamp	2015-04-21 15:49:58 +02:00
Laurent Destailleur	1c8e1638c7	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-21 12:08:56 +02:00
Laurent Destailleur	a690276060	Fix js warnings, select2 css was not loaded.	2015-04-21 12:08:36 +02:00
Laurent Destailleur	5a9c40eb59	Fix minor look and security errors	2015-04-21 12:03:51 +02:00
Laurent Destailleur	7a4d1d990e	Fix security hole	2015-04-21 11:41:21 +02:00
Laurent Destailleur	e476b57795	Merge pull request #2678 from defrance69/patch-60 ... add tab management on salarie payement	2015-04-21 11:15:20 +02:00
Laurent Destailleur	9d1c609c4f	Merge pull request #2538 from marcosgdf/units ... NEW [ task 977 ] New option to manage product unit Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements	2015-04-21 11:14:50 +02:00
Arnaud Aujon	afc4d89c64	Orders webservice : Generate pdf document on valid	2015-04-20 20:18:17 +02:00
Florian HENRY	99cc52fdfa	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-20 17:17:38 +02:00
jfefe	f2d05ce754	Add missing value for object line type (product or service)	2015-04-20 16:20:04 +02:00
Marcos García de La Fuente	ad5dd8e70f	[ bug #1897 ] PHP Fatal error when editing Margin module settings with USER_UPDATE_SESSION trigger turned on	2015-04-20 01:36:48 +02:00
Laurent Destailleur	94589b9935	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-19 23:15:39 +02:00
Laurent Destailleur	65dafeee55	Uniformize feature between invoice and merging tool	2015-04-19 23:15:24 +02:00
Marcos García de La Fuente	28b89a2dec	Fix [ bug #1786 ] Spanish localtax2 calculation errors with corrective invoices	2015-04-19 18:58:56 +02:00
Marcos García de La Fuente	2967bc7df7	Merge branch 'develop' into units	2015-04-19 17:19:59 +02:00
Marcos García de La Fuente	7be7a770c1	Implemented units for CommandeFournisseur and FactureFournisseur	2015-04-19 16:46:24 +02:00
BENKE Charlie	51cb680f19	Create info.php ... add info tabs	2015-04-19 13:32:59 +02:00
BENKE Charlie	a151defc4b	Add tabs management	2015-04-19 13:28:51 +02:00
BENKE Charlie	5a68cba013	Create salaries.lib.php ... add lib salaries for menu management	2015-04-19 13:25:43 +02:00
Florian HENRY	72c92557de	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/product/class/propalmergepdfproduct.class.php	2015-04-19 13:06:59 +02:00
Florian HENRY	37bc7c3f1d	typo	2015-04-19 13:05:40 +02:00
Raphaël Doursenaud	e7a21de11d	Use minified select2 js lib	2015-04-19 12:58:47 +02:00
Laurent Destailleur	935f94fd62	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-19 12:25:36 +02:00
Laurent Destailleur	207b372930	CSS	2015-04-19 12:06:21 +02:00
Juanjo Menent	9efdc09c32	Merge pull request #2674 from atm-maxime/develop ... Fix : multi upload of files in document tabs	2015-04-19 10:03:27 +02:00
Laurent Destailleur	22921ad26b	Fix phpunit	2015-04-19 04:43:28 +02:00
Maxime Kohlhaas	e692950627	Fix : multi upload of files in document tabs	2015-04-19 04:04:43 +02:00
Laurent Destailleur	72845b21c7	Add log	2015-04-19 04:01:31 +02:00
jfefe	f5db4d5bb7	Fix: missing getEntity function	2015-04-19 03:05:37 +02:00
Laurent Destailleur	111b54d82c	Fix phpcs	2015-04-19 03:02:49 +02:00
Laurent Destailleur	df9973f462	Merge pull request #2671 from aternatik/img_title ... Picto war S01E02	2015-04-19 01:59:44 +02:00
Maxime Kohlhaas	54a68116e4	Fix : prevelement with SEPA	2015-04-19 01:55:35 +02:00
Laurent Destailleur	a091a24657	Fix phpcs	2015-04-19 01:52:15 +02:00
Laurent Destailleur	3a4ad7c038	Bad colspan	2015-04-19 01:09:30 +02:00
Laurent Destailleur	b7ffdba55f	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-04-19 01:00:48 +02:00
Marcos García de La Fuente	270bca740c	Merge branch 'develop' into units ... Conflicts: htdocs/compta/facture/fiche-rec.php	2015-04-19 00:59:04 +02:00
Laurent Destailleur	5597e4a8b6	Merge pull request #2668 from GPCsolutions/typo ... Fixed wrong field	2015-04-19 00:59:01 +02:00
Laurent Destailleur	6d07b74ce6	Merge pull request #2669 from atm-maxime/develop ... Fix : use getentity for stock sharing	2015-04-19 00:58:20 +02:00
Laurent Destailleur	b0ad595f00	Add filelist	2015-04-19 00:54:44 +02:00
Laurent Destailleur	4b84e191a6	Use popup for confirm	2015-04-19 00:49:55 +02:00
Marcos García de La Fuente	15b1f03a08	Merge branch 'develop' into commercial-name ... Conflicts: htdocs/comm/list.php htdocs/comm/prospect/list.php htdocs/societe/consumption.php htdocs/societe/soc.php	2015-04-19 00:48:07 +02:00
Maxime Kohlhaas	ee8b5be43b	Typo	2015-04-19 00:46:30 +02:00
Raphaël Doursenaud	19d9af4cf5	Fixed wrong field	2015-04-19 00:44:39 +02:00
jfefe	c90801c0ad	Add home picto for index page title	2015-04-19 00:41:29 +02:00
jfefe	c9d377f07f	Modify generic picto	2015-04-19 00:38:29 +02:00
jfefe	c3e81c2d21	Modify accountancy picto for titles	2015-04-19 00:33:36 +02:00
Maxime Kohlhaas	0112cbaaf0	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2015-04-19 00:28:15 +02:00
Maxime Kohlhaas	5a66e1f98a	Fix : include facture class for outstanding bill	2015-04-19 00:26:05 +02:00
Laurent Destailleur	5b29c87933	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/compta/deplacement/fiche.php htdocs/core/tpl/objectline_create.tpl.php htdocs/expedition/fiche.php	2015-04-19 00:23:46 +02:00
Laurent Destailleur	ab77158757	Merge remote-tracking branch 'origin/3.5' into 3.6 ... Conflicts: htdocs/expedition/fiche.php	2015-04-18 23:55:17 +02:00
Florian HENRY	41631ceed9	typo	2015-04-18 23:43:11 +02:00
jfefe	57d04c601f	Add title picto for project section	2015-04-18 23:39:04 +02:00
Marcos García de La Fuente	87f97ed545	Merge branch 'develop' into units ... Conflicts: htdocs/commande/class/commande.class.php htdocs/compta/facture.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql htdocs/product/admin/product.php htdocs/product/card.php	2015-04-18 23:38:14 +02:00
jfefe	73ef3d73c2	Change size of generic title picto	2015-04-18 23:28:20 +02:00
jfefe	23e5bc4f53	Add title image for bank section	2015-04-18 23:17:47 +02:00
jfefe	22c3406498	Change title images for accountancy section	2015-04-18 23:17:47 +02:00
jfefe	25812f0071	Add picto for commercial pages titles	2015-04-18 23:17:44 +02:00
jfefe	3825b89ead	Change companies and product title picto	2015-04-18 23:13:48 +02:00
jfefe	c905f88498	Change generic and setup image title	2015-04-18 23:13:48 +02:00
Maxime Kohlhaas	098f2ab0b1	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2015-04-18 23:09:24 +02:00
Maxime Kohlhaas	bcf9e7fb37	Fix : use getentity for stock sharing	2015-04-18 23:08:21 +02:00
Laurent Destailleur	5c80d46b74	Merge pull request #2663 from FHenry/develop ... fix bug #2652	2015-04-18 23:06:19 +02:00
Florian HENRY	11e1d0310c	typo	2015-04-18 23:00:22 +02:00
Florian HENRY	f2018b7946	fix bug #2652	2015-04-18 22:59:20 +02:00
Juanjo Menent	065711df3b	Merge pull request #2662 from marcosgdf/fk_soc ... Fixed problem with u.fk_soc in PR #2654	2015-04-18 22:52:29 +02:00
Marcos García de La Fuente	2a8cf5f8be	Fixed problem with last PR #2654	2015-04-18 22:50:40 +02:00
Laurent Destailleur	70de42f576	Merge pull request #2658 from bafbes/develop ... Register contributor information for last pull request	2015-04-18 22:23:59 +02:00
Laurent Destailleur	80e1ca73fb	Merge pull request #2659 from FHenry/develop ... fix : #2640	2015-04-18 22:23:28 +02:00
Marcos García de La Fuente	a8f60a5c18	Revert "Sanitize for security." ... This reverts commit 1598a5d3a6.	2015-04-18 22:11:11 +02:00
Florian HENRY	92494cd1ec	fix : #2640	2015-04-18 22:09:19 +02:00
bafbes	f4fe71a7fe	Update filefunc.inc.php	2015-04-18 20:59:00 +01:00
Laurent Destailleur	ed6abb0f79	Merge branch 'bug-2576' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2576 ... Conflicts: ChangeLog	2015-04-18 20:56:27 +02:00
Laurent Destailleur	25a996644d	Merge branch 'fr-2613' of https://github.com/marcosgdf/dolibarr into develop ... Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-04-18 20:52:02 +02:00
Marcos García de La Fuente	e2e6049c7f	Copyright	2015-04-18 20:50:03 +02:00
Laurent Destailleur	9dd73de9b0	Merge branch 'fr-2613' of https://github.com/marcosgdf/dolibarr into marcosgdf-fr-2613 ... Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-04-18 20:47:20 +02:00
Laurent Destailleur	1598a5d3a6	Sanitize for security.	2015-04-18 20:43:52 +02:00
Marcos García de La Fuente	c07e26dcac	Merge branch 'develop' into fr-2613 ... Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-04-18 20:42:57 +02:00
Marcos García de La Fuente	dc790ff586	NEW: Feature request: A page to merge two thirdparties into one #2613	2015-04-18 20:41:09 +02:00
Laurent Destailleur	21a6fd1cb4	Merge pull request #2633 from bafbes/develop ... NEW : dev feature : replace conf filename with "conf" parameter on url b...	2015-04-18 20:30:49 +02:00
Laurent Destailleur	8be83cd043	Merge branch 'develop' of https://github.com/fappels/dolibarr into fappels-develop ... Conflicts: htdocs/langs/en_US/sendings.lang	2015-04-18 20:29:25 +02:00
Laurent Destailleur	b3fc8d2940	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop ... Conflicts: htdocs/langs/en_US/products.lang	2015-04-18 20:27:50 +02:00
Laurent Destailleur	fcbb4a5328	Merge branch 'langtool' of https://github.com/Diciannove/dolibarr into Diciannove-langtool ... Conflicts: htdocs/langs/en_US/main.lang htdocs/langs/en_US/orders.lang htdocs/langs/en_US/stocks.lang	2015-04-18 20:26:23 +02:00
Laurent Destailleur	f7b2b00ebd	Merge pull request #2650 from FHenry/dev_pdfpropalmergeproductpdf ... NEW : Propal merge PDF product attached files (on option)	2015-04-18 20:18:57 +02:00
Laurent Destailleur	b7cf0ded00	Merge branch 'bug-2577' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2577 ... Conflicts: ChangeLog	2015-04-18 20:12:27 +02:00
Maxime Kohlhaas	7b035d3b5f	Fix : menu financial was not displayed when only supplier module is activated	2015-04-18 20:11:19 +02:00
Laurent Destailleur	9b69b64626	Merge branch 'bug-2583' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2583 ... Conflicts: ChangeLog	2015-04-18 20:10:06 +02:00
Laurent Destailleur	cb0e45d54b	Merge pull request #2647 from aternatik/fix_css ... Fix : css properties for lists and input fields	2015-04-18 20:05:10 +02:00
Laurent Destailleur	6e136616c6	Merge pull request #2649 from atm-maxime/develop ... Alert when oustanding amount excedeed	2015-04-18 20:04:25 +02:00
Maxime Kohlhaas	ecf1fbe5a7	Typo	2015-04-18 20:03:40 +02:00
jfefe	bee5af4d9e	Fix : bad usage of empty function with GETPOST	2015-04-18 19:56:36 +02:00
Maxime Kohlhaas	c3bcda74f3	Fix : unit price without tax is now subprice (not pu_ht)	2015-04-18 19:17:05 +02:00
Florian HENRY	62ef9743ea	Merge branch 'develop' into dev_pdfpropalmergeproductpdf	2015-04-18 19:16:33 +02:00
Juanjo Menent	c5d8fa4602	Fix: solves #2644	2015-04-18 19:14:30 +02:00
Maxime Kohlhaas	2ddef9ffd9	Alert when oustanding amount excedeed	2015-04-18 19:08:44 +02:00
Maxime Kohlhaas	53469c803a	Typo	2015-04-18 19:08:01 +02:00
jfefe	4f0829d4ea	Adjust CSS : missing color for input, textarea and select list	2015-04-18 19:01:33 +02:00
Laurent Destailleur	e4656ecfd4	Merge pull request #2636 from defrance69/patch-59 ... NEW Add list of orders into commercial page	2015-04-18 18:58:06 +02:00
jfefe	c5b191d590	Adjust CSS properties for tables	2015-04-18 18:57:13 +02:00
Francis Appels	c5599efe62	Don't show 'undifined' when no max delivery time	2015-04-18 18:56:25 +02:00
Laurent Destailleur	4201cf9f7f	Merge pull request #2638 from atm-maxime/fix_cust_outstanding ... Fix cust outstanding	2015-04-18 18:56:23 +02:00
Francis Appels	308ee40134	Fix Lang part2 ... Fix lang in en_us	2015-04-18 18:53:25 +02:00
Laurent Destailleur	07bf403354	Merge pull request #2645 from atm-maxime/develop ... Fix : outstanding limit was not saved	2015-04-18 18:49:53 +02:00
Maxime Kohlhaas	8e4771daa0	Fix : outstanding limit was not saved	2015-04-18 18:48:50 +02:00
Laurent Destailleur	e1403b136c	Merge pull request #2639 from aternatik/stable_resource ... New : mark resource module as stable	2015-04-18 18:48:24 +02:00
Florian HENRY	e15d4c045d	NEW : Propal merge product card PDF into azur	2015-04-18 18:44:05 +02:00
philippe grand	838329f3d9	Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop	2015-04-18 18:36:00 +02:00
Maxime Kohlhaas	51522decf3	Fix : price in editkeyval function was forcing a price rounding	2015-04-18 18:33:46 +02:00
jfefe	5c4633d538	New : mark resource module as stable	2015-04-18 18:18:21 +02:00
Laurent Destailleur	08dfcf3afc	Merge	2015-04-18 18:14:55 +02:00
jfefe	f2e19f2326	Fix: error when deleting resource	2015-04-18 18:07:59 +02:00
philippe grand	eaf0fda6aa	fix syntax errors	2015-04-18 18:07:41 +02:00
Laurent Destailleur	ca05c9a26f	Fix PHPCS	2015-04-18 18:07:36 +02:00
Maxime Kohlhaas	8b307aac56	Fix : customer outstanding was not calculated properly	2015-04-18 18:06:27 +02:00
Maxime Kohlhaas	e0af2feced	Fix : on impayees remain to pay did not include deposits	2015-04-18 18:06:02 +02:00
faust	4bb83de146	en_US: fix lang	2015-04-18 18:03:40 +02:00
BENKE Charlie	c9aaf51627	Update index.php ... add last orders in commercial index page	2015-04-18 17:49:48 +02:00
Laurent Destailleur	873899a5d4	Merge pull request #2635 from FHenry/develop ... fix typo	2015-04-18 17:45:25 +02:00
Laurent Destailleur	e7505e49cf	Merge pull request #2623 from GPCsolutions/pear_mail_mime ... Update PEAR Mail_MIME to 1.8.9	2015-04-18 17:44:30 +02:00
Laurent Destailleur	471a5857d2	Fix CSS	2015-04-18 17:42:24 +02:00
Florian HENRY	bbed849911	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-18 17:37:49 +02:00
Florian HENRY	b7191a541c	All send email card works with model choice box	2015-04-18 17:15:36 +02:00
Laurent Destailleur	69b9de08b8	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-18 16:54:20 +02:00
Laurent Destailleur	ce81f58986	Fix several bugs into edit of supplier lines	2015-04-18 16:54:00 +02:00
Florian HENRY	cc887ceff3	fix typo	2015-04-18 16:45:45 +02:00
faust	b7fb3d7d9e	en_US: 'opened' is not an adjective...	2015-04-18 16:39:57 +02:00
jean	8006edc278	correct issue 2589 getting user signature in script, when user is sended ... through a script parameter	2015-04-18 16:39:53 +02:00
bafbes	4c8dc1ba5b	NEW : dev feature : replace conf filename with "conf" parameter on url by GET	2015-04-18 15:26:33 +01:00
faust	fb57cced55	en_US: fix typos and errors	2015-04-18 16:04:48 +02:00
faust	9a3b5305fe	fix duplicate lines	2015-04-18 15:35:19 +02:00
Laurent Destailleur	a5ba7c664e	Merge pull request #2627 from FHenry/develop ... NEW : Email template choose on thirdparty card	2015-04-18 15:24:46 +02:00
Laurent Destailleur	8cd22ae6c8	Merge pull request #2631 from fappels/develop ... FIX lang	2015-04-18 15:11:50 +02:00
Laurent Destailleur	7c8bb14fe4	Merge pull request #2628 from marcosgdf/bug-2579 ... Fix Bug #2579: Bad display duration enter data on intervention	2015-04-18 15:11:32 +02:00
Marcos García de La Fuente	d6a2d972a6	Fix: [ bug #2601 ] Supplier orderstoinvoice does not work with PostgreSQL	2015-04-18 15:07:19 +02:00
Laurent Destailleur	246c8a01a6	Merge pull request #2611 from defrance69/patch-58 ... Update paiement.class.php	2015-04-18 15:05:16 +02:00
jfefe	fe01c4470d	Show tools menu when activating resource module	2015-04-18 15:04:44 +02:00
Juanjo Menent	459737e171	Merge pull request #2625 from marcosgdf/bug-2601 ... Fix bug #2601 Supplier orderstoinvoice does not work with PostgreSQL	2015-04-18 15:03:01 +02:00
Marcos García de La Fuente	401c0584e5	Fix: [ bug #2598 ] Untranslated "Supplier" tab name and some tax inputs in /fourn/card.php	2015-04-18 14:59:19 +02:00
Juanjo Menent	5203d5ead0	Merge pull request #2626 from marcosgdf/bug-2598 ... Fix bug #2598 Untranslated "Supplier" tab name and some tax inputs in /fourn/card.php	2015-04-18 14:58:25 +02:00
Juanjo Menent	f8a1bf9a10	Merge pull request #2621 from atm-maxime/develop ... Remove debug trace	2015-04-18 14:49:23 +02:00
Juanjo Menent	2f8ed32f76	Fix: Issues if strict mode option ONLY_FULL_GROUP_BY is activated	2015-04-18 14:17:00 +02:00
Juanjo Menent	d3f24dab0a	Fix: Issues if strict mode option ONLY_FULL_GROUP_BY is activated	2015-04-18 13:36:47 +02:00
Florian HENRY	d3592c8d58	typo	2015-04-18 13:09:35 +02:00
Francis Appels	d6fc0aa7b5	FIX lang	2015-04-18 11:42:38 +02:00
Juanjo Menent	dc74302985	Fix: Issues if strict mode option ONLY_FULL_GROUP_BY is activated	2015-04-18 11:32:01 +02:00
Marcos García de La Fuente	de494b2904	Fix Bug #2579: Bad display duration enter data on intervention	2015-04-18 11:25:15 +02:00
Maxime Kohlhaas	2b8efc302a	Fix : shipment model selection	2015-04-18 11:24:55 +02:00
Florian HENRY	6391fd0c40	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-18 11:07:07 +02:00
Florian HENRY	3d8a7ee179	Start email template selector	2015-04-18 11:06:53 +02:00
Marcos García de La Fuente	b5ed65f838	Fix: [ bug #2598 ] Untranslated "Supplier" tab name and some tax inputs in /fourn/card.php	2015-04-18 10:50:07 +02:00
Maxime Kohlhaas	1fa43379c9	Merge branch 'develop' of github.com:atm-maxime/dolibarr into develop	2015-04-18 10:43:11 +02:00
Marcos García de La Fuente	9fee7a9827	Fix: [ bug #2601 ] Supplier orderstoinvoice does not work with PostgreSQL	2015-04-18 10:30:58 +02:00
Maxime Kohlhaas	7aba52c810	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2015-04-18 10:29:43 +02:00
Raphaël Doursenaud	e8332cc724	Update PEAR Mail_MIME to 1.8.9 ... This is nusoap dependency and the unkown previous version was GPL incompatible and used deprecated functions.	2015-04-18 04:27:15 +02:00
Maxime Kohlhaas	7223495ac2	Fix : date_delivery was not a datetime	2015-04-18 04:21:16 +02:00
Laurent Destailleur	deb62f1ffd	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/core/class/html.formother.class.php htdocs/core/lib/ajax.lib.php htdocs/expedition/list.php	2015-04-18 04:18:59 +02:00
Maxime Kohlhaas	07fd6a3ae7	Fix : delivery date was not a datetime	2015-04-18 04:18:40 +02:00
Maxime Kohlhaas	e6c5b234fc	Remove debug trace	2015-04-18 03:54:33 +02:00
Laurent Destailleur	aab9b0ec60	Merge pull request #2620 from atm-maxime/develop_cat_multiselect ... New : categories as multi-select on product	2015-04-18 03:53:05 +02:00
Laurent Destailleur	6de4292ccf	Merge pull request #2619 from atm-maxime/develop ... NEW shipment lists by status	2015-04-18 03:51:11 +02:00
Laurent Destailleur	f17a6cbe7e	Merge branch 'develop' of https://github.com/novalore/dolibarr into ... novalore-develop Conflicts: htdocs/langs/en_US/trips.lang	2015-04-18 03:37:18 +02:00
Maxime Kohlhaas	9d8036e5a7	New : categories as multi-select on product	2015-04-18 03:12:42 +02:00
Maxime Kohlhaas	8db50e4606	Fix : menu for product batch	2015-04-18 01:39:41 +02:00
Maxime Kohlhaas	73a66f789c	New : shipment lists by status	2015-04-18 01:21:22 +02:00
Maxime Kohlhaas	d94564ab93	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2015-04-18 01:11:28 +02:00
Maxime Kohlhaas	1ad610130a	Fix : shipment list sql request and delivery display	2015-04-18 01:09:16 +02:00
faust	c21961c4d8	word order in workflow.lang	2015-04-18 00:50:32 +02:00
faust	066e05a8ef	another typo	2015-04-18 00:21:25 +02:00
Laurent Destailleur	5617399974	Removed deprecatd lines	2015-04-18 00:13:12 +02:00
faust	a54dd15afb	fixed typos in trips.lang	2015-04-18 00:04:09 +02:00
Maxime Kohlhaas	3073aab48b	Fix : discount were not working anymore on supplier order and bill	2015-04-17 23:31:51 +02:00
Maxime Kohlhaas	24c3607403	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2015-04-17 22:58:06 +02:00
Laurent Destailleur	a034cda6ac	Better test	2015-04-17 22:48:39 +02:00
Laurent Destailleur	b8736b0a6f	Merge pull request #2457 from accett/patch-5 ... Update functionsnumtoword.lib.php	2015-04-17 22:42:19 +02:00
Laurent Destailleur	78e6aacda2	Fix format not supported by js lib	2015-04-17 13:22:36 +02:00
Florian HENRY	32e067c806	Remove debug	2015-04-16 14:22:48 +02:00
Laurent Destailleur	e508b28d74	Fix doliforge bug 1707	2015-04-15 18:53:39 +02:00
Laurent Destailleur	bf254baa02	Fix doliforge bug 1707	2015-04-15 18:50:41 +02:00
Laurent Destailleur	8511f1f7ef	Fix the data-role parameter	2015-04-15 18:14:26 +02:00
Laurent Destailleur	9a604fa0bc	Fix grammar	2015-04-15 17:55:59 +02:00
BENKE Charlie	6eb17a79da	Update paiement.class.php ... standardisation of the call of fetch by adding the $ref even they not realy used	2015-04-15 11:40:12 +02:00
Laurent Destailleur	0c1ea1c7f2	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-14 20:10:27 +02:00
Laurent Destailleur	799ec63bf7	Merge pull request #2604 from defrance69/patch-57 ... Update modBanque.class.php	2015-04-14 20:05:41 +02:00
Laurent Destailleur	95029516db	Field note was renamed.	2015-04-14 19:46:49 +02:00
Raphaël Doursenaud	54b8aa8a0b	Fixed typo in task export ... Closes #2607, #2609	2015-04-14 19:14:16 +02:00
Frédéric FRANCE	cce0ff83b9	Add VAT for Senegal	2015-04-14 16:33:56 +02:00
Laurent Destailleur	c668b82fd5	Fix translation	2015-04-14 14:23:26 +02:00
Maxime Kohlhaas	4d119065a8	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2015-04-14 13:01:41 +02:00
Laurent Destailleur	75b3fd442e	Add option to allow to filter list on project creation	2015-04-14 12:32:19 +02:00
Laurent Destailleur	f323e89919	Add hidden option PROJECT_LIST_SHOW_STARTDATE to show start date of ... project. Increase visible length of fields.	2015-04-14 12:21:23 +02:00
BENKE Charlie	aa076b2af6	Update modBanque.class.php ... added the id of bordereau for link with the cheque	2015-04-14 10:19:41 +02:00
BENKE Charlie	db02cab550	Update modBanque.class.php ... added fk_bordereau on bank export 1 to link the 2 export	2015-04-14 01:23:42 +02:00
Laurent Destailleur	39e4f52497	Fix: all amount must be without tax	2015-04-13 19:11:23 +02:00
Laurent Destailleur	97cdc55839	NEW Module notification should details of emails into confirm box, not ... only number.	2015-04-13 17:04:18 +02:00
Laurent Destailleur	d7ef1e7da0	The supplier code was not visible on supplier pdf.	2015-04-13 14:25:27 +02:00
Laurent Destailleur	5dc1102601	Fix object not defined	2015-04-13 13:34:13 +02:00
Laurent Destailleur	dbaaa44c76	Fix: link must not be visible if module disabled	2015-04-13 13:22:12 +02:00
Laurent Destailleur	c228302039	minor fix	2015-04-13 13:14:13 +02:00
Laurent Destailleur	ae103e34b8	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: build/debian/changelog htdocs/compta/facture.php htdocs/core/lib/price.lib.php htdocs/install/mysql/migration/3.6.0-3.7.0.sql htdocs/opensurvey/public/studs.php htdocs/projet/element.php	2015-04-13 13:08:46 +02:00
Laurent Destailleur	44f10ebec2	Fix: do not add new value	2015-04-13 13:01:23 +02:00
Laurent Destailleur	0e7f4db0bb	Move translation key	2015-04-13 09:59:38 +02:00
Laurent Destailleur	0e81dc7c6c	Add missing langs	2015-04-13 09:24:39 +02:00
Laurent Destailleur	4aef43c14b	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-04-13 01:33:38 +02:00
Laurent Destailleur	584ca971b0	Fix #2600	2015-04-13 01:32:53 +02:00
Laurent Destailleur	c0ddfbfab7	Merge pull request #2597 from marcosgdf/bug-1906 ... Fixes for bugs #1906 and #1905	2015-04-13 01:04:23 +02:00
Marcos García de La Fuente	8f0c41dbd2	Fix: [ bug #1905 ] Custom deplacement types do not get translated in deplacement card	2015-04-12 22:02:25 +02:00
Marcos García de La Fuente	6173706531	Fix: [ bug #1906 ] Deplacement does not allow translated decimal format	2015-04-12 21:55:20 +02:00
Marcos García de La Fuente	9cfb295675	Fix: Bug #2576 Unable to edit a dictionary entry that has # in its ref	2015-04-12 21:05:26 +02:00
Marcos García de La Fuente	bbd01c0c8d	Fix: Bug #2577 Incorrect invoice status in "Linked objects" page of a project	2015-04-12 20:59:58 +02:00
Marcos García de La Fuente	728b64e334	Fix Bug #2583: Unable to create a bank transfer with localized numbers	2015-04-12 20:24:22 +02:00
Laurent Destailleur	e036e7baf4	Restore correct filling of page	2015-04-12 19:37:49 +02:00
Laurent Destailleur	c01677af2d	Merge pull request #2588 from defrance69/patch-56 ... Update pdf_paiement.class.php	2015-04-12 19:24:22 +02:00
Laurent Destailleur	93bb9549c9	Merge pull request #2586 from frederic34/patch-7 ... Update loan card	2015-04-12 19:21:57 +02:00
Laurent Destailleur	193c080744	PHPCS	2015-04-12 19:20:48 +02:00
Laurent Destailleur	744b0b0e45	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-12 17:08:33 +02:00
Laurent Destailleur	8ebad7a395	A serious rewrite of a lot of code to have the module batch number ... stable.	2015-04-12 17:08:14 +02:00
Laurent Destailleur	6502d1c269	Fix: filter on stock too low forgot some lines	2015-04-12 15:22:34 +02:00
Laurent Destailleur	1272b03e5e	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: build/debian/changelog htdocs/commande/fiche.php htdocs/compta/facture.php htdocs/core/menus/standard/eldy.lib.php htdocs/fourn/facture/fiche.php htdocs/product/stock/mouvement.php htdocs/projet/element.php htdocs/societe/rib.php htdocs/theme/bureau2crea/img/statut4.png	2015-04-12 12:03:59 +02:00
Laurent Destailleur	1bf95b48c1	Fix remove warning when posting a vote	2015-04-12 11:45:50 +02:00
Laurent Destailleur	d5afff4388	Fix warnings when submitting a vote for a survey	2015-04-12 11:42:49 +02:00
Laurent Destailleur	56a14da5d4	FIXME that are not bug are replaced with TODO ... Add control on batch movement (lot/serial is mandatory, and control eatby and sellby are same for each lot/serial)	2015-04-12 04:01:28 +02:00
Laurent Destailleur	74a4bca42c	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-04-11 22:52:27 +02:00
Laurent Destailleur	6889162d7a	Fix: management of vat type 2, 4 and 6 is now ok. ... Works for canada and ivory cost.	2015-04-11 22:51:53 +02:00
BENKE Charlie	59bff8afac	Update pdf_paiement.class.php ... Minors bug fix (first page with bad numbering) improvement compute of number of page better fillment of page with line (save the tree is good for karma)	2015-04-11 12:22:42 +02:00
Frédéric FRANCE	cc40f58aa1	Update loan card	2015-04-10 18:26:28 +02:00
Laurent Destailleur	d76c1a9f42	Can filter on serial number into movement list	2015-04-10 12:59:33 +02:00
Laurent Destailleur	787083028b	Fix: entered data are not lsot when error	2015-04-10 12:10:05 +02:00
Laurent Destailleur	530650b857	Make module productbatch stable	2015-04-10 11:59:41 +02:00
Laurent Destailleur	15531a7ebc	Better title for some boxes	2015-04-10 11:50:57 +02:00
Laurent Destailleur	d944c3bf17	Code cleaner when we are using multicompany	2015-04-10 11:40:24 +02:00
Laurent Destailleur	c25872b182	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-10 10:21:10 +02:00
Laurent Destailleur	fb868bc8f9	We must use the dol_fiche_head and dol_fiche_end also for "create" ... forms.	2015-04-10 10:20:51 +02:00
Laurent Destailleur	2b071a6091	NEW: For a contract line, price is no more mandatory.	2015-04-10 10:17:20 +02:00
aspangaro	1f5ca497d3	Bug: Untranslated table header in /compta/bank/search.php	2015-04-09 20:50:19 +02:00
Laurent Destailleur	503a4ff7a0	Enhance filtering for bank transaction and timesheet.	2015-04-09 20:40:49 +02:00
Laurent Destailleur	3ee2790737	Always sho project info when opening task card	2015-04-09 16:26:21 +02:00
Laurent Destailleur	e01e0faeef	Can reopen to edit supplier order once ordered	2015-04-09 16:15:52 +02:00
Laurent Destailleur	ed6f2e9386	Fix error management	2015-04-09 15:14:50 +02:00
braito4	914b324a67	minor bug drag and drop total line in tasks list	2015-04-09 10:37:54 +02:00
Laurent Destailleur	f6c2472d92	fix var not declared	2015-04-08 21:50:17 +02:00
Laurent Destailleur	275724e7d6	Merge remote-tracking branch 'origin/3.7' into develop	2015-04-08 21:36:30 +02:00
Laurent Destailleur	ddde869ca4	Sync transifex	2015-04-08 21:35:27 +02:00
Laurent Destailleur	c4daca2bac	Fix #1682	2015-04-08 21:34:04 +02:00
Laurent Destailleur	e3bbbaf2e1	Comments	2015-04-08 20:52:18 +02:00
Laurent Destailleur	ca7a7a9038	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/compta/facture.php htdocs/product/stock/product.php	2015-04-08 20:43:51 +02:00
Laurent Destailleur	efb43a7015	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-04-08 20:40:19 +02:00
Laurent Destailleur	091420f8ae	Close #2568	2015-04-08 20:40:01 +02:00
Laurent Destailleur	aaef3a41c0	Short label into table	2015-04-08 19:33:06 +02:00
Laurent Destailleur	1bbecc0912	Restore link to stock for products.	2015-04-08 19:26:36 +02:00
Laurent Destailleur	0987aa1c74	Bad trans key	2015-04-08 17:42:28 +02:00
Laurent Destailleur	fc803e7000	Fix permission lost when enabled/disabled module.	2015-04-08 17:33:38 +02:00
Laurent Destailleur	b3355df3bf	Fix delivery delay could not be set to unknown	2015-04-08 13:00:03 +02:00
Laurent Destailleur	1efa5bcabd	Fix: Avoid duplicate tooltip	2015-04-08 12:44:11 +02:00
Laurent Destailleur	dd48942f1d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-08 12:23:11 +02:00
Laurent Destailleur	17fa1ce5b6	Fix #2552	2015-04-08 12:22:52 +02:00
Laurent Destailleur	edd104a6bc	Merge pull request #2563 from frederic34/patch-7 ... Accounts "from" & "to" need to have same currency	2015-04-08 11:51:41 +02:00
Laurent Destailleur	15ba6716f5	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-08 11:50:59 +02:00
Laurent Destailleur	94087f539f	Fix style	2015-04-08 11:50:40 +02:00
Frédéric FRANCE	7f62892609	Display total with currency code	2015-04-08 09:19:41 +02:00
Frédéric FRANCE	856238c876	Accounts "from" & "to" need to have same currency	2015-04-08 09:09:11 +02:00
Laurent Destailleur	369d6915b8	Fix: PHPCS	2015-04-08 00:14:44 +02:00
Laurent Destailleur	bc69703888	Fix phpcs	2015-04-08 00:07:46 +02:00
Laurent Destailleur	f9c8b2e1cf	Merge pull request #2560 from Dolibarr/scrutinizer-patch-2 ... Scrutinizer Auto-Fixes	2015-04-07 23:56:40 +02:00
Laurent Destailleur	bb83eb0f68	Merge pull request #2561 from frederic34/patch-5 ... Fix #2559 Bug: Untranslated "Total" in Bank module	2015-04-07 23:50:17 +02:00
Juanjo Menent	1f4a131691	Fix: Bad permission assignments for stock movements actions ... Conflicts: htdocs/product/stock/product.php	2015-04-07 20:43:27 +02:00
Juanjo Menent	d7ba9b3312	Fix: Bad permission assignments for stock movements actions ... Conflicts: htdocs/core/menus/standard/eldy.lib.php htdocs/product/stock/mouvement.php	2015-04-07 20:40:48 +02:00
Juanjo Menent	9d8cb459f1	Fix: Bad permission assignments for stock movements actions	2015-04-07 20:28:45 +02:00
Juanjo Menent	c2bc2c9ea6	Solves #2542 Bug: Contracts store localtax preferences ... Conflicts: htdocs/compta/facture.php	2015-04-07 20:10:27 +02:00
Juanjo Menent	1ab70a7086	Solves #2542 Bug: Contracts store localtax preferences ... Conflicts: htdocs/compta/facture.php	2015-04-07 20:05:56 +02:00
Juanjo Menent	35a6ed90a0	Solves #2542 Bug: Contracts store localtax preferences	2015-04-07 20:02:12 +02:00
Juanjo Menent	a0de33912e	Closes #2545 Bug: Missing object_margin.png in Amarok theme ... Conflicts: ChangeLog	2015-04-07 18:57:45 +02:00
Juanjo Menent	2dfaf08f61	Closes #2545 Bug: Missing object_margin.png in Amarok theme ... Conflicts: ChangeLog	2015-04-07 18:54:38 +02:00
Juanjo Menent	345b609ff0	Closes #2545 Bug: Missing object_margin.png in Amarok theme	2015-04-07 18:41:40 +02:00
Frédéric FRANCE	06c749942a	Update index.php	2015-04-07 18:40:19 +02:00
Laurent Destailleur	49e678b9c0	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-07 18:14:44 +02:00
Laurent Destailleur	547b7d5f91	Fix #2539	2015-04-07 18:14:20 +02:00
Frédéric FRANCE	0dc7bc0ddb	Add badge	2015-04-07 12:54:10 +02:00
Frédéric FRANCE	7a2942684c	Fix #2559 Bug: Untranslated "Total" in Bank module	2015-04-07 12:45:25 +02:00
Laurent Destailleur	6fa0234409	Uniformize code	2015-04-07 03:00:11 +02:00
Laurent Destailleur	ad50810c7a	Fix deprecated code	2015-04-07 02:48:19 +02:00
Laurent Destailleur	c931576e0e	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-07 02:45:43 +02:00
Scrutinizer Auto-Fixer	918ed34364	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2015-04-07 00:45:30 +00:00
Laurent Destailleur	1d6a8a46f1	To clean an int we must use (int) and not trim()	2015-04-07 02:44:30 +02:00
Laurent Destailleur	c25af905a3	Merge pull request #2557 from frederic34/adherent ... Add public note to members	2015-04-06 21:23:40 +02:00
Frédéric FRANCE	85d8d06ca4	Travis fix CMailFile.class.php	2015-04-06 20:02:29 +02:00
Laurent Destailleur	493392d89f	Remove warnings	2015-04-06 19:46:10 +02:00
Laurent Destailleur	c148f82452	Fix warning	2015-04-06 19:31:25 +02:00
Laurent Destailleur	2550c6b0af	Must exclude draft and abandon into default filter.	2015-04-06 19:22:58 +02:00
Laurent Destailleur	877e60c76f	Set default filter	2015-04-06 19:20:11 +02:00
Laurent Destailleur	02e8879d3b	NEW Feature to build a merged pdf with all unpaid invoice can work for ... paid invoices.	2015-04-06 19:11:31 +02:00
frederic34	19b55cb4c1	Add public note to members	2015-04-06 18:58:36 +02:00
Laurent Destailleur	3d161deb17	Fix more robust function	2015-04-06 16:50:26 +02:00
Laurent Destailleur	b49705d5d0	Status and amount of object should always be visible.	2015-04-06 16:13:23 +02:00
Laurent Destailleur	683f27f6b1	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-06 14:11:52 +02:00
Laurent Destailleur	fa162cb327	Missing field	2015-04-06 14:11:28 +02:00
Laurent Destailleur	0155d75f27	Merge pull request #2554 from aspangaro/develop-adherent ... Module member: move field note to note_private & typo	2015-04-06 12:58:52 +02:00
Laurent Destailleur	a42eb7b787	Merge branch 'bug-2535' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2535 ... Conflicts: ChangeLog	2015-04-06 12:52:33 +02:00
Laurent Destailleur	8ce66aad79	Merge branch 'bug-2534' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2534 ... Conflicts: ChangeLog	2015-04-06 12:48:55 +02:00
Laurent Destailleur	d8b50722f3	Merge pull request #2548 from marcosgdf/bug-2540 ... Close #2540 Bug: Incorrect HTML in "Bank account" tab of a Thirdparty	2015-04-06 12:41:38 +02:00
Laurent Destailleur	f9608bf41d	Merge pull request #2547 from marcosgdf/bug-2543 ... Closes #2543: Untranslated "Contract" origin string when creating an invoice from a contract	2015-04-06 12:38:54 +02:00
Laurent Destailleur	e2508287bd	Merge pull request #2537 from marcosgdf/cq ... Created Propal, FactureFourniseur, and Commande constants for status	2015-04-06 12:37:52 +02:00
Scrutinizer Auto-Fixer	4da737424e	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2015-04-06 10:25:30 +00:00
Laurent Destailleur	828dc2c9f4	Fix code standard	2015-04-06 12:22:52 +02:00
Laurent Destailleur	a5c74a7d95	Clean code	2015-04-06 11:59:58 +02:00
Laurent Destailleur	2627662f5c	fix value ust be a string	2015-04-06 11:36:31 +02:00
Laurent Destailleur	8fb14b122a	Fix phpcs	2015-04-06 11:28:06 +02:00
aspangaro	03b1db138e	Debug	2015-04-06 08:20:23 +02:00
aspangaro	ca82c2f36d	Merge remote-tracking branch 'Upstream/develop' into develop-adherent	2015-04-06 07:53:04 +02:00
Laurent Destailleur	5fa21f37f0	Fix trim label	2015-04-05 17:13:24 +02:00
Marcos García de La Fuente	5c8e92d52a	Closes #2535 Bug: Untranslated string in "Linked objects" page of a project	2015-04-04 17:52:05 +02:00
Marcos García de La Fuente	50091dfe8b	Closes #2534 SQL error when editing a supplier invoice line	2015-04-04 17:44:52 +02:00
Marcos García de La Fuente	611406b75e	Closes #2540 Bug: Incorrect HTML in "Bank account" tab of a Thirdparty	2015-04-04 17:34:06 +02:00
Marcos García de La Fuente	65f4a818d4	Merge branch '3.6' into bug-2543	2015-04-04 17:29:17 +02:00
Marcos García de La Fuente	40860a84d1	Closes #2543: Untranslated "Contract" origin string when creating an invoice from a contract	2015-04-04 17:28:24 +02:00
Laurent Destailleur	4d6b7b4bae	Clean code	2015-04-04 04:17:07 +02:00
Laurent Destailleur	678e55f9da	We must add a viewport meta to have font visible on mobile	2015-04-04 04:11:54 +02:00
Laurent Destailleur	2ec5595277	NEW Can install an external module from admin pages, if web server has ... permission for and if setup is ok for.	2015-04-04 00:19:03 +02:00
Laurent Destailleur	106a393054	NEW Add function dolCopyDir to copy directory with recursive content.	2015-04-03 23:42:56 +02:00
Laurent Destailleur	afecab3f39	Better error management for dol_uncompress	2015-04-03 18:42:07 +02:00
Laurent Destailleur	e6c9e07de4	NEW Backup and restore tool is easier to use	2015-04-03 17:17:02 +02:00
Marcos García de La Fuente	7075ac74c4	Merge branch 'develop' into units ... Conflicts: htdocs/comm/propal.php htdocs/comm/propal/class/propal.class.php htdocs/commande/card.php htdocs/commande/class/commande.class.php htdocs/compta/facture.php htdocs/compta/facture/class/facture.class.php htdocs/contrat/card.php htdocs/contrat/class/contrat.class.php htdocs/core/class/commonobjectline.class.php htdocs/core/tpl/objectline_create.tpl.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql htdocs/product/class/product.class.php	2015-04-03 15:45:54 +02:00
Florian HENRY	092dd38851	FIX : [ bug #1916 ] problème d'icone pour l'état "clos" sur les projets	2015-04-03 15:33:41 +02:00
Laurent Destailleur	b01369a32e	Error management	2015-04-03 15:25:24 +02:00
Laurent Destailleur	f38bf5a7d2	Fix extrafields were not saved when creating a supplier order ... Fix removed hooks where we must use trigger	2015-04-03 11:00:52 +02:00
aspangaro	d897139f25	Module member: move field note in note_private	2015-04-03 06:54:08 +02:00
Marcos García de La Fuente	6fe803cd86	Created Propal, FactureFourniseur, and Commande constants for status	2015-04-03 05:18:47 +02:00
Laurent Destailleur	69eaa032bf	Merge remote-tracking branch 'origin/3.7' into develop	2015-04-03 01:10:55 +02:00
Laurent Destailleur	98b1d6170d	Fix style fieldrequired must be used only in create/edit mode.	2015-04-03 01:07:17 +02:00
Laurent Destailleur	2f2f141fd8	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-03 00:28:44 +02:00
Laurent Destailleur	d71a3c52b4	Comments	2015-04-03 00:28:35 +02:00
Laurent Destailleur	9921eb8496	Fix error when upgating price	2015-04-02 19:41:19 +02:00
Laurent Destailleur	3c02b37c21	Merge pull request #2531 from frederic34/patch-5 ... Update box_actions.php	2015-04-02 19:03:03 +02:00
Frédéric FRANCE	8d7fb7b0f6	Travis Fix don.class.php	2015-04-02 18:48:47 +02:00
Laurent Destailleur	e480177d9c	Fix error of triggers not reported to user	2015-04-02 18:44:02 +02:00
Frédéric FRANCE	5a17a51212	Update box_actions.php	2015-04-02 18:11:30 +02:00
Laurent Destailleur	4241244345	Fix: class not defined	2015-04-02 17:35:07 +02:00
Laurent Destailleur	f3ad345930	Add loan lang file	2015-04-02 16:59:20 +02:00
Laurent Destailleur	c90a86e4a4	Fix filters for exports	2015-04-02 16:58:36 +02:00
Laurent Destailleur	761409caf6	Fix sql error	2015-04-02 15:17:07 +02:00
Laurent Destailleur	805c73b849	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/langs/en_GB/main.lang htdocs/langs/es_CO/salaries.lang	2015-04-02 14:04:04 +02:00
Laurent Destailleur	acbeb2b360	Fix en_GB	2015-04-02 14:03:52 +02:00
Laurent Destailleur	cf0f458a51	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/commande/dispatch.php htdocs/langs/el_GR/projects.lang htdocs/langs/en_GB/bills.lang htdocs/langs/en_GB/main.lang htdocs/langs/en_GB/orders.lang htdocs/langs/es_AR/bills.lang htdocs/langs/es_CO/admin.lang htdocs/langs/es_CO/main.lang htdocs/langs/es_ES/bills.lang htdocs/langs/es_ES/projects.lang htdocs/langs/fa_IR/categories.lang htdocs/langs/fr_FR/admin.lang htdocs/langs/fr_FR/bills.lang htdocs/langs/fr_FR/other.lang htdocs/langs/fr_FR/projects.lang htdocs/langs/lv_LV/bills.lang htdocs/langs/nb_NO/bills.lang htdocs/langs/pl_PL/bills.lang htdocs/langs/pl_PL/mails.lang htdocs/langs/pl_PL/projects.lang htdocs/langs/ro_RO/bills.lang htdocs/langs/ro_RO/products.lang htdocs/langs/ro_RO/projects.lang htdocs/langs/ru_RU/bills.lang htdocs/langs/ru_RU/projects.lang htdocs/langs/sl_SI/main.lang htdocs/langs/tr_TR/bills.lang htdocs/langs/tr_TR/projects.lang htdocs/langs/vi_VN/bills.lang	2015-04-02 13:57:20 +02:00
Laurent Destailleur	8d892e19c1	Sync from transifex	2015-04-02 13:56:32 +02:00
Laurent Destailleur	0f51314c7e	Sync from transifex	2015-04-02 13:28:20 +02:00
Laurent Destailleur	8390b9bd16	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-02 12:55:58 +02:00
Laurent Destailleur	50d77d7e6f	Correct source lang	2015-04-02 12:55:44 +02:00
Laurent Destailleur	c62687d198	Comment	2015-04-02 12:55:00 +02:00
Laurent Destailleur	fcb70bc193	Merge pull request #2528 from frederic34/patch-16 ... Update card.php	2015-04-02 11:46:59 +02:00
Laurent Destailleur	c5d81193a2	Merge pull request #2515 from frederic34/patch-11 ... Correction warning delay workboard propal	2015-04-02 11:45:57 +02:00
Laurent Destailleur	5b190371ab	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-04-02 11:45:01 +02:00
Laurent Destailleur	f89d74d6bc	Deletion of dir was not complete.	2015-04-02 11:44:43 +02:00
Laurent Destailleur	e827b1b9cd	Merge pull request #2529 from aspangaro/develop-don ... NEW better integration in project for donation module	2015-04-02 11:42:15 +02:00
Laurent Destailleur	d8bec2fb59	Merge pull request #2507 from frederic34/doc4contact ... Add document tab for contact	2015-04-02 11:41:35 +02:00
Laurent Destailleur	c9f690904c	Merge pull request #2514 from frederic34/patch-10 ... Correction for workboard in compta/bank/index.php	2015-04-02 11:40:55 +02:00
Laurent Destailleur	051f3474c4	Merge pull request #2512 from frederic34/patch-9 ... Add badge	2015-04-02 11:25:06 +02:00
Laurent Destailleur	c5b6fc45eb	Merge pull request #2527 from frederic34/patch-15 ... Delete phpinfo.php	2015-04-02 11:24:52 +02:00
Laurent Destailleur	0187a9a4ee	Merge pull request #2511 from fappels/3.7 ... FIX: dispatch batch products	2015-04-02 11:24:01 +02:00
Laurent Destailleur	bff4b0e52e	Merge pull request #2506 from frederic34/patch-8 ... Add ORDER_CANCEL in interface_90_all_Demo.class.php	2015-04-02 11:22:38 +02:00
Laurent Destailleur	f38212f20e	Merge pull request #2508 from FHenry/3.6 ... FIX : [ bug #1913 ] [EXPORT] [PGSQL] Bug when filtering export on a specific year	2015-04-02 11:22:18 +02:00
Laurent Destailleur	17b0d98211	Merge pull request #2516 from aspangaro/develop-search ... New: Add a button to purge criteria in bank lines list	2015-04-02 11:15:12 +02:00
Laurent Destailleur	10f967e07a	FIX #2519	2015-04-02 11:11:03 +02:00
Laurent Destailleur	c476858880	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-02 11:01:41 +02:00
Laurent Destailleur	29fc2652e1	FIX #2519	2015-04-02 11:00:37 +02:00
aspangaro	115777f05d	New: Module project - Elements - Show detail of amounts with a minus when the amount decrease margin	2015-04-02 06:54:04 +02:00
aspangaro	d8f56eb406	New: better integration in project for donation module ... Fixed: Rename fk_project in fk_projet (Sic!) for better compatibility	2015-04-02 06:36:32 +02:00
Juanjo Menent	4588b2bb4c	Merge pull request #2517 from frederic34/patch-12 ... Closes #2509 Bug: Ref is not shown in the bubble that appears when the mouse is over an agenda link	2015-04-02 00:56:42 +02:00
Juanjo Menent	b42903440c	Merge pull request #2521 from aspangaro/develop-don ... Closes #2520	2015-04-02 00:51:29 +02:00
Frédéric FRANCE	dc89e36583	Update card.php	2015-04-01 21:12:08 +02:00
Laurent Destailleur	d8db32a99c	NEW: Introduce option SUPPLIER_ORDER_DOUBLE_APPROVAL to allow 2 ... approvals to make a supplier order approved. Activating this option introduce a new permission to the second level approval.	2015-04-01 21:00:51 +02:00
Frédéric FRANCE	824d8ddb57	Delete phpinfo.php	2015-04-01 18:57:54 +02:00
Laurent Destailleur	8e9c1c4747	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/commande/card.php htdocs/commande/class/commande.class.php htdocs/commande/list.php htdocs/core/class/notify.class.php htdocs/core/login/functions_dolibarr.php htdocs/exports/export.php htdocs/langs/en_US/admin.lang	2015-04-01 16:33:39 +02:00
Laurent Destailleur	16a620f926	Fix: Deadlock situation (when order were canceled, no way to make ... nothing on it) Fix: Don't know how I forgot this events into trigger system.	2015-04-01 16:07:22 +02:00
Laurent Destailleur	ad1e4134a9	Fix: bcc was lost if notif to bcc was also forced	2015-04-01 12:22:50 +02:00
Laurent Destailleur	1bc0f6c99f	Fix: do not show end date when it is same than start date	2015-04-01 12:02:32 +02:00
Laurent Destailleur	293495467f	Fix: Bad ref used into notification message	2015-04-01 11:30:48 +02:00
Laurent Destailleur	5fe5ec939d	Fix: delivery date must not be autofill with current date	2015-04-01 10:54:24 +02:00
aspangaro	4918326958	Fixed: Wrong path to don.class in element project	2015-04-01 08:13:10 +02:00
Frédéric FRANCE	08e7cb2e84	Correction for tooltip	2015-03-31 21:57:48 +02:00
Frédéric FRANCE	f0ed848609	Update actioncomm.class.php	2015-03-31 21:38:38 +02:00
Frédéric FRANCE	9ee6fdd163	Tooltip of actioncomm show empty ref	2015-03-31 21:07:17 +02:00
aspangaro	309b059089	New: Add a button to purge criteria in bank lines list	2015-03-31 21:00:22 +02:00
Frédéric FRANCE	46af2caba1	Correction warning delay workboard propal	2015-03-31 18:51:24 +02:00
Frédéric FRANCE	fc5d7e57a2	Correction for workboard in compta/bank/index.php	2015-03-31 18:31:36 +02:00
Laurent Destailleur	39d0c15c15	Comment	2015-03-31 17:23:07 +02:00
Laurent Destailleur	29e049d4f9	Comment	2015-03-31 17:22:14 +02:00
Laurent Destailleur	c71efc8f2e	Avoid pb with scrutinizer	2015-03-31 16:59:40 +02:00
Frédéric FRANCE	2a34ec9db1	Add badge	2015-03-31 16:26:32 +02:00
Francis Appels	bba8b206a1	FIX: dispatch batch products ... Fix dispatching batch products and add error message. Make DispatchProduct method backwards comp and add missing $trigger. Add missing ORDER_SUPPLIER_DISPATCH trigger to demo class.	2015-03-31 15:48:08 +02:00
Laurent Destailleur	2bdca3d76b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-03-31 11:33:10 +02:00
Laurent Destailleur	2d50cc92b9	Differentiate title for customer and supplier orders/invoices.	2015-03-31 11:32:47 +02:00
frederic34	fe6227e93f	Typo	2015-03-31 08:45:36 +02:00
Florian HENRY	104bbfdc1c	Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6	2015-03-30 19:14:49 +02:00
Florian HENRY	65ec02bae1	FIX : [ bug #1913 ] [EXPORT] [PGSQL] Bug when filtering export on a ... specific year	2015-03-30 19:13:55 +02:00
frederic34	bab04258e0	Add document tab for contact	2015-03-30 18:15:29 +02:00
Frédéric FRANCE	e602c43e12	Add ORDER_CANCEL in interface_90_all_Demo.class.php	2015-03-30 12:14:35 +02:00
Laurent Destailleur	9d752c6fca	Sync from transifex	2015-03-30 10:55:08 +02:00
Laurent Destailleur	86603b01dd	Merge pull request #2504 from marcosgdf/constants ... Implemented constants for some object types and statuses	2015-03-30 09:25:18 +02:00
Marcos García de La Fuente	8b8171c700	Merge branch 'develop' into commercial-name ... Conflicts: htdocs/comm/card.php	2015-03-30 03:25:57 +02:00
Marcos García de La Fuente	1b7ffd80f1	Typo	2015-03-30 03:19:20 +02:00
Marcos García de La Fuente	831177ef99	Implemented constants for Product class	2015-03-30 03:14:07 +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
Marcos García de La Fuente	cc1d298f29	Merge branch 'develop' into constants ... Conflicts: htdocs/commande/card.php htdocs/compta/facture/class/facture.class.php	2015-03-30 02:36:46 +02:00
Laurent Destailleur	63ec6febec	Merge pull request #2502 from frederic34/patch-7 ... Travis Fix don.class.php	2015-03-30 02:00:26 +02:00
Laurent Destailleur	a3b5f35903	Merge pull request #2501 from frederic34/patch-5 ... Travis Fix for donation.lib.php	2015-03-30 02:00:14 +02:00
Laurent Destailleur	b66d8c9afc	Merge pull request #2496 from aspangaro/develop-ER-patch1 ... Fixed: HRM menu is not activated when only Expense Report module is acti...	2015-03-30 01:59:50 +02:00
aspangaro	c22a563422	New: Add management for accounting account in admin donation & correct bugs	2015-03-29 21:04:20 +02:00
Frédéric FRANCE	6c26063fc8	Travis Fix don.clss.php	2015-03-29 18:29:09 +02:00
Frédéric FRANCE	bcd7516e25	Fix for donation.lib.php	2015-03-29 18:22:45 +02:00
frederic34	b6b1617741	Work on payment loan	2015-03-29 17:53:36 +02:00
Laurent Destailleur	fd8d09c8c0	Fix avoid warning	2015-03-29 17:53:05 +02:00
Laurent Destailleur	73b2e0bd01	Merge pull request #2471 from marcosgdf/refactor ... refactor	2015-03-29 16:17:36 +02:00
Laurent Destailleur	3cc4358e72	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: build/makepack-dolibarr.pl htdocs/commande/liste.php htdocs/product/stock/product.php	2015-03-29 15:24:17 +02:00
Laurent Destailleur	018a0d779f	Fix translation	2015-03-29 15:18:10 +02:00
aspangaro	a715ccfcb8	Fixed: HRM menu is not activated when only Expense Report module is activated	2015-03-29 15:11:41 +02:00
Laurent Destailleur	661961876a	Merge pull request #2485 from aspangaro/develop-patch2 ... Fix: Missing language key	2015-03-29 15:05:37 +02:00
Laurent Destailleur	af51415f8e	Merge pull request #2486 from frederic34/patch-2 ... PhotoInTooltip for getNomUrl company	2015-03-29 15:05:25 +02:00
Laurent Destailleur	32bda97712	Merge pull request #2494 from aspangaro/develop-ReviewAssoc ... New: Review module donation	2015-03-29 15:04:22 +02:00
Laurent Destailleur	b4c096de09	Merge pull request #2495 from frederic34/loan ... Debug payment loan	2015-03-29 15:03:08 +02:00
aspangaro	96b7cac93f	Delete useless line	2015-03-29 14:30:43 +02:00
aspangaro	ed493b651b	Icons & fr_FR options not show	2015-03-29 14:29:53 +02:00
frederic34	7b9ba4bd26	debug payment	2015-03-29 13:37:17 +02:00
frederic34	bf3e78a63d	Debug payment loan	2015-03-29 11:39:55 +02:00
aspangaro	a92f68a5ed	Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc	2015-03-29 09:25:06 +02:00
aspangaro	c733249c75	Don Remove old file	2015-03-29 09:23:39 +02:00
aspangaro	ce6df7c022	Debug	2015-03-29 09:20:32 +02:00
Laurent Destailleur	b8bd27009e	Simplify code	2015-03-28 18:32:53 +01:00
Ion Agorria	043d11d785	check if $mc is a valid global	2015-03-28 18:22:01 +01:00
Laurent Destailleur	4887a28f91	Merge pull request #2492 from IonAgorria/mc-fix ... Fix: Check if $mc is a valid global	2015-03-28 18:20:28 +01:00
frederic34	be1595a187	Add tab for notes	2015-03-28 17:42:33 +01:00
Laurent Destailleur	3f5fe432e7	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-03-28 17:18:10 +01:00
Laurent Destailleur	b60a56dc94	Fix search on command	2015-03-28 17:17:55 +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
Ion Agorria	1791631976	check if $mc is a valid global	2015-03-28 03:44:16 +01:00
frederic34	a0c7cedaf1	Tooltip for loan	2015-03-27 18:09:00 +01:00
frederic34	631c3d72e3	Correction for notes	2015-03-27 17:23:27 +01:00
frederic34	82b8fe6b7d	Note private and Note public for loan	2015-03-27 17:13:52 +01:00
Frédéric FRANCE	375e0b7e2a	PhotoInTooltip for getNomUrl company	2015-03-27 08:32:51 +01:00
aspangaro	9d25a1c7ed	Fix: Missing language key	2015-03-27 06:59:21 +01:00
aspangaro	77b123cb2d	Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc	2015-03-27 06:30:35 +01:00
Laurent Destailleur	cb16e069df	Better explanation	2015-03-27 01:17:21 +01:00
Laurent Destailleur	e777516f38	Merge pull request #2483 from FHenry/3.7 ... FIX : fetch actioncomm return 0 if no record found instead of nothing	2015-03-27 01:10:28 +01:00
Laurent Destailleur	d0e4d8046b	Merge pull request #2480 from marcosgdf/minor-2 ... Corrected search box alignment in Customer orders list	2015-03-27 01:09:06 +01:00
Laurent Destailleur	39f46227c8	Merge pull request #2479 from marcosgdf/minor ... Merge branch 'develop' into minor	2015-03-27 01:08:23 +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
Laurent Destailleur	813cb36424	Merge pull request #2476 from fmarcet/3.7 ... Fix: Not using where on sellist	2015-03-27 00:50:48 +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	6a0916b3fa	Correct path	2015-03-26 21:03:56 +01:00
aspangaro	a39f81b1a6	FIXED: Correct path of loan class	2015-03-26 20:51:27 +01:00
aspangaro	059bb40345	Debug	2015-03-26 20:43:34 +01:00
Florian HENRY	2e13479e8f	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-03-26 16:56:06 +01:00
Florian HENRY	26c29216d9	syntax	2015-03-26 16:55:13 +01:00
Laurent Destailleur	42c2c81e28	Fix detection of html was wrong with img	2015-03-26 12:05:52 +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
Marcos García de La Fuente	e59fed9f38	Corrected search box alignment in Customer orders list	2015-03-26 11:08:34 +01:00
Marcos García de La Fuente	b83ef4c1ec	Merge branch 'develop' into minor	2015-03-26 10:58:35 +01:00
Marcos García de La Fuente	50a3563f03	Minor correction to the product list of a supplier	2015-03-26 10:57:13 +01:00
aspangaro	b60f1e33d6	Debug	2015-03-26 06:29:16 +01:00
aspangaro	8d4ceadd7e	Dir "Don"	2015-03-25 22:38:44 +01:00
aspangaro	2b2b43afb6	Dir "Don"	2015-03-25 22:37:14 +01:00
aspangaro	679391d337	Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc	2015-03-25 20:59:48 +01:00
Laurent Destailleur	f7b8a2b036	Restore align=right	2015-03-25 18:13:53 +01:00
Laurent Destailleur	ab739e162c	Merge remote-tracking branch 'origin/3.7' into develop	2015-03-25 18:11:29 +01:00
Laurent Destailleur	8be08c692f	Fix some secuity tests were not done.	2015-03-25 18:10:45 +01:00
frederic34	19540b14b5	Add last shipments to company card	2015-03-25 16:38:18 +01:00
Maxime Kohlhaas	b250c5588e	Fix : Quantity displayed for virtual stock explanations was wrong	2015-03-25 16:11:36 +01:00
Laurent Destailleur	21b1f7cc26	Fix bad calculation of email for notifications	2015-03-25 14:51:12 +01:00
Laurent Destailleur	cc2d86bd58	Status of project was not visible on thirdparty card	2015-03-25 14:31:04 +01:00
fmarcet	456b11d148	Fix: Not using where on sellist	2015-03-25 11:23:05 +01:00
Laurent Destailleur	f0fb6f1b2c	Work on md theme	2015-03-24 22:24:15 +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
Laurent Destailleur	6c4369b7ba	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-03-23 23:29:14 +01:00
Laurent Destailleur	efe9c21b81	Merge pull request #2382 from aspangaro/develop-loan ... NEW: Module loans	2015-03-23 23:28:57 +01:00
Laurent Destailleur	dd3a6edf4e	Merge pull request #2473 from marcosgdf/invoicesmenu ... NEW: Implemented statuses submenu for List menu of supplier and customer invoices.	2015-03-23 23:27:29 +01:00
Laurent Destailleur	1202d63f98	Indent	2015-03-23 23:25:07 +01:00
Fab	ea7f00e777	Fix displaying of the warning image. ... Since last commit, $objp->date_livraison returns nothing ; max() will then returns wrong result, and the warning image will be displayed when it should not.	2015-03-23 20:05:31 +01:00
Laurent Destailleur	6f22243104	Add option SUPPLIER_ORDER_NO_DIRECT_APPROVE	2015-03-23 15:25:21 +01:00
Laurent Destailleur	1a59b7b447	Add option SUPPLIER_ORDER_NO_DIRECT_APPROVE	2015-03-23 15:23:44 +01:00
Laurent Destailleur	3844d4e6f7	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: ChangeLog htdocs/core/boxes/box_activity.php htdocs/fourn/commande/card.php htdocs/user/card.php	2015-03-23 15:16:37 +01:00
Laurent Destailleur	72ce60ff36	Enhance themes	2015-03-23 14:53:21 +01:00
Laurent Destailleur	dc0d3504dd	Fix: Bad notification key	2015-03-23 14:52:47 +01:00
Laurent Destailleur	b9c3c074b1	Fix: a line was inserted when making update ... Fix: missing message into notification admin page	2015-03-23 14:43:19 +01:00
Laurent Destailleur	b7a466c95f	Fix bad style for total	2015-03-23 13:50:14 +01:00
Marcos García de La Fuente	c6ad35e001	Implemented statuses submenu for List menu of supplier and customer invoices. ... Menu "Pending payment" has been moved to the "List" submenu.	2015-03-23 13:42:50 +01:00
Laurent Destailleur	cbadfa5075	NEW: Title of page project contains project ref and label	2015-03-23 12:44:41 +01:00
Laurent Destailleur	5d2e09ec51	Fix: navigation in page was wrong and typo errors.	2015-03-23 12:31:32 +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	f6d8d2eb23	Correct stats	2015-03-23 06:56:12 +01:00
Laurent Destailleur	994606dbc9	More space for tables (=> to follow css bootsrap rules)	2015-03-23 05:09:55 +01:00
Laurent Destailleur	7ad0a32559	Fix for multicompany users.	2015-03-23 04:51:24 +01:00
Laurent Destailleur	e269aa83b5	More comments	2015-03-23 04:16:58 +01:00
Laurent Destailleur	042556a9cf	Better comments	2015-03-23 03:50:55 +01:00
Laurent Destailleur	f4b1d95b3e	Some fix for multicompany module	2015-03-23 02:39:41 +01:00
Marcos García de La Fuente	3d50b41b8e	Reverted $rowid instead of $id property	2015-03-23 01:40:33 +01:00
Marcos García de La Fuente	4349f27299	Revert "Revert "Refactor 1""	2015-03-23 01:39:12 +01:00
Laurent Destailleur	f650a773c3	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-03-22 22:30:11 +01:00
Laurent Destailleur	5c36bb94f2	Work on theme material design	2015-03-22 22:29:52 +01:00
Laurent Destailleur	3ed0cf6a75	css fix	2015-03-22 22:25:26 +01:00
Laurent Destailleur	87faf530e0	Merge pull request #2468 from defrance69/patch-55 ... Update extrafields.class.php	2015-03-22 21:28:53 +01:00
Laurent Destailleur	abcebd7875	Merge pull request #2462 from defrance69/patch-54 ... Update extrafields.class.php	2015-03-22 21:27:38 +01:00
Laurent Destailleur	2632b8e25b	Update test page to prepare datatables architecture.	2015-03-22 21:26:13 +01:00
Laurent Destailleur	1a1959b52c	Fix: Solve conflict with imgup and imgdown class use for sort fields and ... to drag and drop lines.	2015-03-22 21:18:25 +01:00
aspangaro	c4d852ffd7	Correct from frederic34	2015-03-22 20:57:41 +01:00
BENKE Charles	730593b525	Update extrafields.class.php ... if no elementtype send at the function, they return an empty array	2015-03-22 20:26:20 +01:00
aspangaro	ad0f1aae6b	Move loan in htdocs	2015-03-22 20:19:22 +01:00
Laurent Destailleur	221d44a4b8	br at wrong place	2015-03-22 18:54:12 +01:00
Laurent Destailleur	d678b554e0	Fix css	2015-03-22 18:39:05 +01:00
Laurent Destailleur	49824a0e56	Method colorStringToArray can accept the # ... Method monthArray can return short label of month	2015-03-22 18:17:25 +01:00
Laurent Destailleur	809690fad7	Saved logo in black int menu eldy. ... Start new dev theme based on material design.	2015-03-22 18:09:22 +01:00
aspangaro	414d4c6432	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2015-03-22 18:08:12 +01:00
Laurent Destailleur	b44f87f548	Clean css	2015-03-22 15:38:50 +01:00
aspangaro	feef043513	Correct	2015-03-22 15:27:05 +01:00
Laurent Destailleur	f35e9a64cd	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-03-22 15:26:13 +01:00
Laurent Destailleur	17dc76838e	Fix bad url	2015-03-22 15:25:57 +01:00
Laurent Destailleur	ed468f8f3f	Merge pull request #2466 from marcosgdf/implemented-supplier-prod-list ... NEW: List of recent modified supplier product prices in Supplier card	2015-03-22 14:30:20 +01:00
Laurent Destailleur	e2675f204d	Merge pull request #2449 from defrance69/patch-51 ... Update export.class.php	2015-03-22 14:07:05 +01:00
Laurent Destailleur	2d90256640	Revert "Refactor 1"	2015-03-22 12:51:29 +01:00
Laurent Destailleur	a79a779b04	Merge pull request #2456 from marcosgdf/refactor-1 ... Refactor 1	2015-03-22 12:47:05 +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
Laurent Destailleur	87da1d734e	mysql 5.5.41 is still bugged returning "lost connexion" during migration ... but there is no more data loss so we can allow this version. A database upgrade to 5.6 will be required if this occurs.	2015-03-22 12:13:26 +01:00
Laurent Destailleur	a55af4387b	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: .travis.yml htdocs/core/class/notify.class.php htdocs/product/stock/class/mouvementstock.class.php test/phpunit/AllTests.php test/phpunit/MouvementStockTest.php	2015-03-22 12:10:39 +01:00
aspangaro	dafc955848	Correct path	2015-03-22 08:25:45 +01:00
aspangaro	9264482e25	Update works	2015-03-22 08:20:19 +01:00
aspangaro	b4b3c45dbc	Update works	2015-03-21 18:00:16 +01:00
Laurent Destailleur	c9b569ad1a	Fix calculation of PMP of product. ... Also add phpunit test to avoid this in future.	2015-03-21 15:31:11 +01:00
Laurent Destailleur	4f9aef6150	Fix calculation of PMP of product. ... Also add phpunit test to avoid this in future.	2015-03-21 15:29:23 +01:00
aspangaro	462e27e069	Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc	2015-03-21 07:13:35 +01:00
aspangaro	4e6c40c781	Update works	2015-03-21 07:12:32 +01:00
aspangaro	15e50ed24f	Update works	2015-03-21 06:21:34 +01:00
Laurent Destailleur	73266bb965	Fix error when using a log hangler that make output into the http ... header. We must add a log before any generation of ouput content so we are sure a buffering of output has been started.	2015-03-21 01:22:05 +01:00
Laurent Destailleur	b8ed553365	We must keep the @, some tools use it to know it is login page.	2015-03-21 01:08:29 +01:00
Laurent Destailleur	33d98b52b5	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-03-20 20:51:50 +01:00
Laurent Destailleur	eeb09b83a1	The test on db version must not lock the phpunit	2015-03-20 20:50:46 +01:00
Laurent Destailleur	9e0aa22a04	Merge pull request #2461 from tiaris/3.7_langs_error ... Add global $langs to method, necessary for triggers to function	2015-03-20 20:43:16 +01:00
Laurent Destailleur	0784e9638a	The test on db version must not lock the phpunit	2015-03-20 17:57:40 +01:00
Laurent Destailleur	b0e928c213	Disable migration with bugged versions	2015-03-20 15:26:00 +01:00
Laurent Destailleur	92af226fff	Fix Not into official 3.7 but must be into migration for 3.7 when ... migration is done by 3.8 code	2015-03-20 15:19:42 +01:00
Marcos García de La Fuente	70f6c3fdbb	NEW: List of recent modified supplier product prices in Supplier card	2015-03-20 12:59:37 +01:00
Marcos García de La Fuente	56295ed438	Fixed delivery date in order list not showing up	2015-03-20 11:28:23 +01:00
aspangaro	0e01dbd44e	Update work	2015-03-20 06:36:48 +01:00
aspangaro	c4a580723d	Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc ... Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-03-20 06:36:06 +01:00
Laurent Destailleur	3a9c195f10	Fix hook management match spec	2015-03-20 00:34:55 +01:00
Laurent Destailleur	d442ac328c	Fix: some replacement tags were missing	2015-03-19 12:34:03 +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
aspangaro	c9d31dab3a	Move module Dons in htdocs->donations	2015-03-19 05:41:13 +01:00
aspangaro	fa41132372	Move module Don in htdocs->donations	2015-03-19 05:22:42 +01:00
aspangaro	7b6cb59f4b	Move module Don in htdocs->donations	2015-03-19 05:17:10 +01:00
aspangaro	4e68586389	Move module Dons in htdocs>donations	2015-03-19 05:08:23 +01:00
aspangaro	dbeccf7653	Update work	2015-03-18 21:56:00 +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	a2676e5768	Fix: the type of notification sent was not filled	2015-03-18 21:06:55 +01:00
Laurent Destailleur	b0b88be81f	Sync transifex	2015-03-18 15:27:27 +01:00
Laurent Destailleur	ba526c5a2f	Merge remote-tracking branch 'origin/3.7' into develop	2015-03-18 14:32:58 +01:00
Laurent Destailleur	cd2fc2f890	Hooks 'printLeftBlock' and 'formConfirm' are now compliant with hook ... development rules. They are "addreplace" hooks, so you must return content with"->resprints='mycontent'" and not with "return 'mycontent'"	2015-03-18 14:31:37 +01:00
Laurent Destailleur	2c61717e10	Fix sql syntax error	2015-03-18 14:19:17 +01:00
Laurent Destailleur	bbef07ef3d	Finished prototype to use hook to add a column by a module.	2015-03-18 14:08:37 +01:00
BENKE Charles	d5afa1b29f	Update extrafields.class.php ... Link object : include only if something to display	2015-03-18 13:23:14 +01:00
Laurent Destailleur	7ef11b2f38	Fix selected attribute not set correctly	2015-03-18 13:16:59 +01:00
Laurent Destailleur	dd82ad69fe	printLeftBlock is now compliant with hook development rules. It is an ... "addreplace" hook so you must return content by doing ->resprints='mycontent' and not by doing return 'mycontent'	2015-03-18 12:30:49 +01:00
Laurent Destailleur	426835781a	Fix hook usage	2015-03-18 12:03:47 +01:00
Laurent Destailleur	840b047468	Work on new timesheet input pages.	2015-03-18 11:20:08 +01:00
Laurent Destailleur	5d4d8151c1	Work on new timesheet input pages.	2015-03-18 11:04:50 +01:00
aspangaro	e6d9d18f25	Update work on donation	2015-03-18 06:29:10 +01:00
aspangaro	4e83952485	Add payment on donation	2015-03-18 05:07:32 +01:00
Laurent Destailleur	37c216cfe4	Fix limit for very slow os.	2015-03-17 15:43:11 +01:00
jean	9e9a8894ea	Add global $langs to method, necessary for triggers to function ... correctly	2015-03-17 14:20:08 +01:00
Laurent Destailleur	c700d8a8ec	Fix remove warning	2015-03-17 11:59:44 +01:00
Laurent Destailleur	166fda4909	Normalize class names	2015-03-17 11:26:23 +01:00
Laurent Destailleur	6e251690ab	Doxygen	2015-03-17 11:23:45 +01:00
Laurent Destailleur	84bea6166e	Doxygen	2015-03-17 10:55:45 +01:00
Laurent Destailleur	4fffeb3a89	Clean code	2015-03-17 10:52:27 +01:00
Laurent Destailleur	689d270552	Doxygen	2015-03-17 10:47:20 +01:00
Laurent Destailleur	bfd979224f	Var not declared	2015-03-17 10:38:25 +01:00
Laurent Destailleur	a73ff524e5	Merge pull request #2459 from Dolibarr/scrutinizer-patch-4 ... Scrutinizer Auto-Fixes	2015-03-17 00:38:40 +01:00
Laurent Destailleur	435be30047	Clean code	2015-03-17 00:35:17 +01:00
Laurent Destailleur	6f7b07548c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-03-17 00:23:49 +01:00
Laurent Destailleur	c65f1aea82	Merge pull request #2458 from mrsof/patch-2 ... FIX : Force ref	2015-03-17 00:23:39 +01:00
Scrutinizer Auto-Fixer	b693ed3f51	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2015-03-16 23:21:17 +00:00
Laurent Destailleur	141fa56d67	Fixed bad parameter	2015-03-17 00:11:04 +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	04c88b0d94	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-03-16 18:26:07 +01:00
Laurent Destailleur	bc4ecf8619	Fix the debug option must works for admin user	2015-03-16 18:25:26 +01:00
Sof	88d9f7f0f1	FIX : Force ref ... Even if you set ref in object class Commande, ref will be set to '(PROVid)' until you call 'valid' function	2015-03-16 12:23:25 +01:00
aspangaro	03bf12bdc0	Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc	2015-03-16 06:32:11 +01:00
aspangaro	1cd81f0e81	Work on module donations	2015-03-16 06:29:15 +01:00
Laurent Destailleur	daf853d040	Merge pull request #2455 from aspangaro/develop-ReviewER ... QUAL: Traduce terms + remove <center>	2015-03-16 02:11:29 +01:00
Laurent Destailleur	1f6d27ceb7	Merge pull request #2454 from defrance69/patch-53 ... Update pdf_paiement.class.php	2015-03-16 01:57:28 +01:00
AcceTT Soluciones Computacionales	60d334f646	Update functionsnumtoword.lib.php ... Now the function convert since -1000000000000 to 1000000000000. Correct some bugs. Change $lang-> default to $langs	2015-03-15 17:47:51 -06:00
Marcos García de La Fuente	6ba3b900b7	PHPCS Fix	2015-03-15 23:42:11 +01:00
Laurent Destailleur	60c72e13b3	Some fixes into export and translation	2015-03-15 23:39:53 +01:00
Laurent Destailleur	79ca1fe147	Clean code.	2015-03-15 23:32:43 +01:00
Laurent Destailleur	73581931cb	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-03-15 23:22:58 +01:00
Marcos García de La Fuente	b822a1e3ad	Merge branch 'develop' into commercial-name ... Conflicts: htdocs/societe/class/societe.class.php	2015-03-15 18:20:17 +01:00
Marcos García de La Fuente	086e439543	Merge branch 'develop' into refactor-1 ... Conflicts: htdocs/core/tpl/objectline_view.tpl.php	2015-03-15 18:16:55 +01:00
Marcos García de La Fuente	efb9f7f4fd	Merge branch 'develop' into refactor-1 ... Conflicts: htdocs/fourn/class/fournisseur.commande.class.php htdocs/includes/tcpdi/fpdf_tpl.php	2015-03-15 18:07:30 +01:00
Marcos García de La Fuente	bcdf3407c7	Fixed line endings	2015-03-15 18:01:21 +01:00
Marcos García de La Fuente	2e68b51a10	Merge remote-tracking branch 'upstream/develop' into develop	2015-03-15 17:52:07 +01:00
aspangaro	d69f066735	QUAL: Traduce terms + remove <center>	2015-03-15 14:04:07 +01:00
Marcos García de La Fuente	094538c07b	Implemented constants in Commande, Facture and Propal	2015-03-15 11:48:57 +01:00
BENKE Charles	8f0e514f83	Update pdf_paiement.class.php ... Add bank account on detail line (usefull when you have many bank account) Add society name in the header (usefull when you nanage many society)	2015-03-15 10:49:16 +01:00
Ion Agorria	e76b6e740f	SQL additions	2015-03-14 16:52:01 +01:00
Ion Agorria	2d09d8196f	Language additions	2015-03-14 16:51:50 +01:00
Ion Agorria	2c80b39937	Configuration page of dinamic prices and price global variables editor	2015-03-14 16:51:38 +01:00
Ion Agorria	9871aaed19	Price global variables and updaters classes	2015-03-14 16:50:46 +01:00
Ion Agorria	5f9b1fa029	Changes for applying new paths	2015-03-14 16:50:02 +01:00
Ion Agorria	fc5899174b	Relocation of expression files	2015-03-14 16:48:56 +01:00
Laurent Destailleur	c197e00090	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-03-14 14:57:58 +01:00
Laurent Destailleur	10bbf463e7	Several bug fixes from scrutinizer	2015-03-14 14:55:41 +01:00
Laurent Destailleur	cfdf12950b	Merge pull request #2452 from Dolibarr/scrutinizer-patch-3 ... Scrutinizer Auto-Fixes	2015-03-14 14:34:06 +01:00
Scrutinizer Auto-Fixer	cbacfa3137	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2015-03-14 13:30:19 +00:00
Laurent Destailleur	c06ff8acd9	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-03-14 14:30:09 +01:00
Laurent Destailleur	44d6bdb1c5	Doc	2015-03-14 14:27:45 +01:00
Laurent Destailleur	ecbee5d4dc	Merge pull request #2450 from defrance69/patch-52 ... New type of extrafields : link to connect dolibarr elements	2015-03-14 14:18:19 +01:00
Laurent Destailleur	c45ec24958	Merge pull request #2379 from atm-maxime/develop ... New : replenish function adds new lines into already existing draft supplier order instead of creating a new supplier order	2015-03-14 14:08:38 +01:00
Laurent Destailleur	c4ff66c5d7	Merge remote-tracking branch 'origin/3.5' into 3.6	2015-03-14 13:46:18 +01:00
Laurent Destailleur	89b22be063	FIXED: Allowed 0 to be used as an account mask. Required by CEGID.	2015-03-14 13:44:26 +01:00
Laurent Destailleur	ca34575df4	FIXED: Allowed 0 to be used as an account mask. Required by CEGID.	2015-03-14 13:42:00 +01:00
Laurent Destailleur	306eff62ad	NEW: Show last official stable version into system - update page.	2015-03-14 13:23:36 +01:00
Laurent Destailleur	e935745727	Merge pull request #2285 from ndrosis/patch-14 ... New: Check live last version from sourceforge.net	2015-03-14 13:09:05 +01:00
Laurent Destailleur	2a09e34bdf	Uniformize etrafields visibility for thirdparties card	2015-03-14 13:05:28 +01:00
BENKE Charles	9e62013bca	Update admin_extrafields_edit.tpl.php ... add new type of extrafields : link	2015-03-14 12:44:26 +01:00
BENKE Charles	4783db82ac	Update admin_extrafields_add.tpl.php ... new type of extrafield : link	2015-03-14 12:42:52 +01:00
Laurent Destailleur	5670e92842	Position of field into pdf baleine	2015-03-14 12:35:03 +01:00
BENKE Charles	0aa2360691	Update extrafields.class.php ... add new extrafields type 'link'	2015-03-14 12:31:22 +01:00
BENKE Charles	df9f822a70	Update commonobject.class.php ... new extafields type	2015-03-14 12:25:17 +01:00
Laurent Destailleur	5146936708	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-03-14 12:04:18 +01:00
BENKE Charles	41a05bc4ba	Update actions_extrafields.inc.php ... add new type of extrafields "link" : linked to dolibarr element	2015-03-14 12:04:00 +01:00
Laurent Destailleur	605a7dee0e	Fix: Deleting task do not return to correct page	2015-03-14 11:56:28 +01:00
Juanjo Menent	a2adeb2807	Fix: [ bug #1836 ] Required parameter missing in Rejetprelevement line ... 159	2015-03-14 10:17:41 +01:00
Juanjo Menent	851cae80a2	Fix: [ bug #1836 ] Required parameter missing in Rejetprelevement line ... 159	2015-03-14 10:16:50 +01:00
Juanjo Menent	a63b1cf4c3	Fix: Showing system error if not enough stock of product into orders ... creation with lines Conflicts: htdocs/commande/class/commande.class.php	2015-03-14 09:57:28 +01:00
Juanjo Menent	4ae1106ffb	Fix: Showing system error if not enough stock of product into orders ... creation with lines Conflicts: htdocs/commande/class/commande.class.php	2015-03-14 09:50:38 +01:00
Juanjo Menent	7cab558ed2	Fix: Showing system error if not enough stock of product into orders ... creation with lines	2015-03-14 09:44:58 +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
Juanjo Menent	971f9b0c30	Fix: Migration script	2015-03-13 22:08:24 +01:00
Laurent Destailleur	a8e7d90ea3	Sync transifex	2015-03-13 22:02:53 +01:00
Laurent Destailleur	d056abc4e1	No need to have this protected. Property can be read with method show() ... and this method can be override.	2015-03-13 21:45:52 +01:00
Laurent Destailleur	50b09fa8a9	Doxygen	2015-03-13 21:39:39 +01:00
Laurent Destailleur	ba2c0a2651	Clean code of hooks. ... Extrafield index on fk_object must be unique.	2015-03-13 20:27:54 +01:00
Laurent Destailleur	bc3f9bf800	Fix: the visible version was not enough to know version of dolibarr. We ... also need the MAIN_FEATURES_LEVEL.	2015-03-13 18:11:31 +01:00
Laurent Destailleur	51c877e32c	Hide a feature that is really not stable. So i move it as a "develop" ... feature.	2015-03-13 18:03:21 +01:00
Laurent Destailleur	f090893807	Hide a feature that is really not stable. So i move it as a "develop" ... feature.	2015-03-13 18:02:54 +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	a452823e1e	Include option FCKEDITOR_ENABLE_DETAILS_FULL to restore compatibility ... with 3.6	2015-03-13 15:20:08 +01:00
Laurent Destailleur	895b2c6e9c	Fix bad merge	2015-03-13 14:37:27 +01:00
Laurent Destailleur	279e16a811	grey disabled	2015-03-13 14:24:32 +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
Laurent Destailleur	9b4f65587f	Fix option MAIN_HTML_TITLE	2015-03-13 13:27:24 +01:00
Laurent Destailleur	59cbde042c	Generalize option MAIN_HTML_TITLE for all tabs of thirdparty.	2015-03-12 17:29:52 +01:00
Maxime Kohlhaas	60022ab80d	NEW : autofocus on product selection dropdown list or search field	2015-03-12 17:25:57 +01:00
Maxime Kohlhaas	ba0f19d116	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2015-03-12 17:12:34 +01:00
Laurent Destailleur	e8e2f65ae5	Debug virtual product interface	2015-03-11 14:55:45 +01:00
Laurent Destailleur	958667ada0	Fix phpcs	2015-03-11 12:33:34 +01:00
BENKE Charles	e7ed8ce95b	Update purchasesjournal.php	2015-03-11 10:23:33 +01:00
BENKE Charles	9fc83ca011	Update sellsjournal.php	2015-03-11 10:23:13 +01:00
BENKE Charles	f88646d954	Update export.class.php	2015-03-11 10:22:37 +01:00
Maxime Kohlhaas	3578ca8baa	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2015-03-11 08:52:09 +01:00
aspangaro	3897e65425	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2015-03-11 05:28:59 +01:00
Laurent Destailleur	e2e95b5f8c	phpcs	2015-03-11 03:58:57 +01:00
Laurent Destailleur	a5645b626c	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/core/tpl/objectline_view.tpl.php htdocs/projet/element.php	2015-03-11 03:55:46 +01:00
Laurent Destailleur	c1432eb2da	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/compta/salaries/fiche.php htdocs/projet/element.php	2015-03-11 03:29:52 +01:00
Laurent Destailleur	ec322e2e29	Revert was not complete	2015-03-11 03:03:17 +01:00
Laurent Destailleur	4b8fa00edb	Merge pull request #2422 from guedel/sqlite3-dev ... Sqlite3 dev	2015-03-11 02:54:15 +01:00
Laurent Destailleur	41b09d8c70	Merge pull request #2448 from atm-maxime/3.6 ... Fix : display proposal date on proposal list	2015-03-11 02:50:26 +01:00
Laurent Destailleur	52e9ae5fe4	Merge pull request #2442 from delcroip/patch-2 ... FIX: jdate returning -62169955200 on x64 machine	2015-03-11 02:35:36 +01:00
Laurent Destailleur	6f39270450	Merge pull request #2310 from FHenry/3.7 ... re-add index.html file	2015-03-11 02:29:29 +01:00
Laurent Destailleur	0ff2a0ad9f	Merge branch 'bug-1825-37' of https://github.com/marcosgdf/dolibarr into ... marcosgdf-bug-1825-37 Conflicts: htdocs/comm/action/index.php	2015-03-11 02:26:01 +01:00
Laurent Destailleur	e8732df747	Merge pull request #2441 from aspangaro/develop-ReviewER ... FIXED: Review Expense Report	2015-03-11 02:14:13 +01:00
Laurent Destailleur	734a7dd5c7	Merge pull request #2443 from biznext/patch-4 ... Fix Anchor link for quick access when editing.	2015-03-11 02:13:29 +01:00
Laurent Destailleur	c271257452	Prepare extrafield for option by default into lists	2015-03-10 22:27:16 +01:00
BENKE Charles	f91127c92a	Update purchasesjournal.php	2015-03-10 21:48:47 +01:00
BENKE Charles	bf86693dcb	Update sellsjournal.php	2015-03-10 21:47:39 +01:00
Laurent Destailleur	548e720ca2	Uniformize code	2015-03-10 19:31:04 +01:00
Laurent Destailleur	b4a8f19696	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/core/class/extrafields.class.php	2015-03-10 18:37:13 +01:00
Laurent Destailleur	364b185442	Fix sql syntax	2015-03-10 18:33:14 +01:00
BENKE Charles	ea0964d1eb	Update export.class.php ... add specific choice of prefix for export (usefull with many dolibarr exporting data)	2015-03-10 17:17:02 +01:00
Laurent Destailleur	154865f545	Fix return error when it is not	2015-03-10 16:37:39 +01:00
Laurent Destailleur	0df2b4cc26	Fix check parameters	2015-03-10 16:14:46 +01:00
Maxime Kohlhaas	05a2a6af00	FIX : [bug #1900] Unable to remove a salary with enough permissions	2015-03-10 15:53:02 +01:00
Maxime Kohlhaas	fa628bba6f	Fix SQL error when installing	2015-03-10 15:34:48 +01:00
Maxime Kohlhaas	6113a5b0f5	FIX : [bug #1883] missing field in SQL installation	2015-03-10 15:27:36 +01:00
Maxime Kohlhaas	6f9fb6a282	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2015-03-10 15:18:08 +01:00
Maxime Kohlhaas	154e1a7991	Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6	2015-03-10 15:14:25 +01:00
Maxime Kohlhaas	978dc8170d	Fix : display proposal date on proposal list	2015-03-10 14:56:58 +01:00
Maxime Kohlhaas	f90df57dc5	New : disallow social contribution modification if paid	2015-03-10 14:49:36 +01:00
Maxime Kohlhaas	db4bbf46fc	New : allow to edit social contribution amount	2015-03-10 14:43:13 +01:00
Laurent Destailleur	0b74ddf5c3	Doxygen	2015-03-10 14:23:40 +01:00
Laurent Destailleur	209f8946d0	All files must be lowercase	2015-03-10 14:17:58 +01:00
Laurent Destailleur	b564b754fc	Doxygen	2015-03-10 14:09:29 +01:00
Laurent Destailleur	9a3e5d7fc5	Fix code unreachable	2015-03-10 13:58:26 +01:00
Laurent Destailleur	12be50d4ba	Doxygen	2015-03-10 13:50:05 +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	d847f9581e	Fix generation of RUM number. Show it on card to help debug.	2015-03-10 11:31:23 +01:00
Laurent Destailleur	35dfaf4dd1	Natural search on numeric works also with several space after operator	2015-03-10 10:14:24 +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	dc30092290	Add column to store salary ref when doing payment.	2015-03-10 10:11:51 +01:00
Laurent Destailleur	90abe5cdf9	NEW: Add current salary on list of payment	2015-03-10 09:29:24 +01:00
Laurent Destailleur	94acbeaa22	Prepare perms on extrafields	2015-03-09 21:40:24 +01:00
Laurent Destailleur	84695845bb	Some fixes into translation and permissions	2015-03-09 21:20:56 +01:00
Laurent Destailleur	88a29b7c9c	Add an advance permission to check/uncheck reception	2015-03-09 20:26:56 +01:00
Laurent Destailleur	bd81dec1a3	Fix missing translation	2015-03-09 19:28:38 +01:00
Laurent Destailleur	bd6f13e6ed	Can export extra fields of lines.	2015-03-09 19:13:19 +01:00
Raphaël Doursenaud	f8dfa61859	FIXED #1901: Inverted supplier order/invoice buttons in project referring objects	2015-03-09 16:20:51 +01:00
Florian HENRY	15dfd7c08d	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-03-09 10:52:09 +01:00
Estephe L.	9d320e4268	Fix Anchor link for quick access when editing. ... This is a quick fix to make anchor link works well when editing a proposal, order or invoice ...	2015-03-08 23:29:09 +01:00
delcroix Patrick	e6984bae9d	FIX: jdate returning -62169955200 on x64 machine ... on x64 machine jdate return -62169955200 instead of 0 when the input is 00-00-00 00:00:00 or equivalent same issue for mktime https://bugs.php.net/bug.php?id=53662	2015-03-08 12:37:07 +01:00
aspangaro	69dc3cdd61	Correct fk_statut & work en list	2015-03-08 08:21:49 +01:00
aspangaro	f3258d59c6	Uniformize status & add price()	2015-03-08 07:21:07 +01:00
aspangaro	80ad1be820	Merge remote-tracking branch 'Upstream/develop' into develop-patch21	2015-03-08 06:40:31 +01:00
Laurent Destailleur	3894a48ffd	Fix: bad CSS	2015-03-08 02:37:25 +01:00
Laurent Destailleur	7c08f33fe1	Missing style buttonRefused	2015-03-08 02:26:41 +01:00
Laurent Destailleur	3e48456359	Fix when no price defined, we must how nothing instead of 0	2015-03-08 02:13:47 +01:00
Laurent Destailleur	56b5bfd25b	NEW: Implement option SUPPLIER_ORDER_USE_DISPATCH_STATUS to add a status ... into each dispathing line of supplier order to "verify" a reception is ok. Status of order can be set to "total/done" only if line is verified.	2015-03-08 02:08:26 +01:00
Laurent Destailleur	dd13e477b1	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-03-07 19:07:21 +01:00
Laurent Destailleur	6db3f1b30e	Add mdule askpricesupplier into MAIN__MODULES_FOR_EXTERNAL	2015-03-07 19:06:56 +01:00
aspangaro	26b1f69025	Add traduction on type label	2015-03-07 15:47:08 +01:00
aspangaro	55db57d10c	Path	2015-03-07 15:41:30 +01:00
aspangaro	2c738df197	Add GPLV3 & Copyright	2015-03-07 15:34:58 +01:00
aspangaro	1baf71874c	Sql & $_SERVER["PHP_SELF"]	2015-03-07 15:31:23 +01:00
aspangaro	f780e908f4	Add index.html	2015-03-07 15:14:51 +01:00
aspangaro	402e0c8ad5	Add condition to access on dictionary c_type_fees when the module is enabled	2015-03-07 15:06:45 +01:00
aspangaro	df305bd316	Deactivate conflict with Mod Deplacement - Need to access on old data	2015-03-07 15:01:30 +01:00
Laurent Destailleur	fc0be43f5f	Fix: beautify search box	2015-03-06 22:40:41 +01:00
Laurent Destailleur	c80007c680	Fix: we must use stockreal of stockvirtual when we are speaking about ... stock ('stock' alone is not accurate enough)	2015-03-06 21:57:58 +01:00
Laurent Destailleur	9e4e9a5411	NEW: Can search on customer order amount into customer order list.	2015-03-06 20:59:18 +01:00
Laurent Destailleur	dd3f569ede	NEW: Enhance the natural_search function so we can use it to search ... numeric fields with criteria with operator <>= inside (< 100, >= 1000)	2015-03-06 20:34:00 +01:00
Laurent Destailleur	a1567778ab	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/core/tpl/objectline_create.tpl.php htdocs/fourn/commande/card.php	2015-03-06 18:51:55 +01:00
Laurent Destailleur	39192163c6	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-03-06 16:22:23 +01:00
Laurent Destailleur	e55a983c03	Fix td balance	2015-03-06 16:13:09 +01:00
Laurent Destailleur	a169b3348e	Fix show alays date fields for contract module. ... Fix select of product were lost.	2015-03-06 14:36:22 +01:00
Laurent Destailleur	77dd07c846	Fix thumbs generation	2015-03-06 13:12:33 +01:00
Florian HENRY	0d801be6a1	NEW: (Dev) DolGraph allow extended class to override $_stringtoshow	2015-03-06 06:12:47 +01:00
Laurent Destailleur	d4e37431e9	Merge pull request #2434 from Dolibarr/scrutinizer-patch-2 ... Scrutinizer Auto-Fixes	2015-03-06 03:18:13 +01:00
Scrutinizer Auto-Fixer	27e99793a3	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2015-03-06 02:10:01 +00:00
Scrutinizer Auto-Fixer	a0762a5113	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2015-03-06 01:31:49 +00:00
Laurent Destailleur	2aefe61506	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-03-06 02:15:18 +01:00
Laurent Destailleur	c7c7c393ee	sql syntax errors	2015-03-06 02:14:59 +01:00
Laurent Destailleur	e67c328cef	Merge pull request #2429 from defrance69/patch-50 ... Update modFacture.class.php	2015-03-06 02:05:00 +01:00
Laurent Destailleur	049174b76f	Fix bugs reported by https://scrutinizer-ci.com/g/Dolibarr/dolibarr/	2015-03-06 01:53:02 +01:00
Laurent Destailleur	1660c1c05b	Fix bug introduced with var_dump	2015-03-06 01:30:46 +01:00
Laurent Destailleur	560b4541cd	Update packager.	2015-03-05 22:08:16 +01:00
Laurent Destailleur	97f36825df	Work on new timesheet page	2015-03-05 21:47:50 +01:00
aspangaro	8c6a50554e	Debug of Frederic34. Thanks !	2015-03-05 20:37:36 +01:00
aspangaro	11704e0807	Merge remote-tracking branch 'Upstream/develop' into develop-loan ... Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-03-05 20:24:53 +01:00
Guillaume de Lestanville	dd2594692e	Updating compatibility with Sqlite3 ... - Replace USING syntax by IN SELECT syntax - Fix error on database creation - Removing test on username parameter when installing.	2015-03-05 17:35:37 +01:00
Laurent Destailleur	22045603b7	Fix bad update of denormalized field	2015-03-05 13:51:29 +01:00
Laurent Destailleur	d7ab3f112c	NEW: Show difference between timespent by everybody and time spent by ... user making timesheet into timesheet pages. NEW: Can enter start hours of task when creating timesheet	2015-03-05 13:48:57 +01:00
Laurent Destailleur	8b5dd4910f	Fix bad update of denormalized field	2015-03-05 13:02:37 +01:00
Laurent Destailleur	78f971f3e1	Merge remote-tracking branch 'origin/3.7' into develop	2015-03-05 11:46:48 +01:00
Laurent Destailleur	9c12c325db	Fix regression into enable/disable external calendars	2015-03-05 11:46:03 +01:00
Laurent Destailleur	d119397129	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/societe/class/societe.class.php	2015-03-05 11:38:16 +01:00
Laurent Destailleur	6c1c1fd691	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/comm/action/index.php htdocs/core/lib/agenda.lib.php htdocs/fourn/paiement/fiche.php	2015-03-05 11:35:39 +01:00
Laurent Destailleur	35a0575aad	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-03-05 11:22:34 +01:00
Laurent Destailleur	dc15eee533	Fix: missing dependcy on project to check before deleting	2015-03-05 11:21:58 +01:00
Laurent Destailleur	e431e24889	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-03-05 11:14:01 +01:00
Laurent Destailleur	c36f92396b	Add navigation into the new timesheet week page. ... Fix bad merge	2015-03-05 11:13:44 +01:00
Laurent Destailleur	39a7271f91	Fix bad merge	2015-03-05 10:57:17 +01:00
guillaume	0ef46b06f4	Sqlite3-PDO restoration ... FR: - Restauration de la version PDO dans sqlite.class.php et désactivation. - Ajout de la classe de base de données Sqlite3 dans sqlite3.class.php EN: - revert of the PDO version of sqlite.class.php and deactivation. - add database class Sqlite3 into sqlite3.class.php.	2015-03-05 10:52:37 +01:00
Marcos García de La Fuente	c9b3cab22b	Mytasks is not clickable	2015-03-05 10:22:33 +01:00
Marcos García de La Fuente	d549030078	Fixed bug with hide/show checkboxes reported by Ruben Almeida (aruben)	2015-03-05 10:20:32 +01:00
BENKE Charles	703a6c1b54	Update modFacture.class.php ... add fk_bank on bill export, this fields is needed to link with external accounting	2015-03-05 00:38:54 +01:00
Laurent Destailleur	ec4c1a493f	Merge pull request #2424 from FHenry/develop ... NEW : Better extrafeild management on proposal and contract line NEW : Add company information into category contact export	2015-03-04 23:14:05 +01:00
Laurent Destailleur	f0f0e7bfbb	Merge pull request #2415 from aspangaro/develop-patch16 ... NEW: Add bank account owner in invoice/proposal/orders footer	2015-03-04 23:07:46 +01:00
Laurent Destailleur	73364c2021	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-03-04 23:05:31 +01:00
Laurent Destailleur	5c36db06f6	Add missing files	2015-03-04 23:04:37 +01:00
Laurent Destailleur	7b7b5090c7	Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into ... atm-ph-incoterm Conflicts: htdocs/comm/propal.php htdocs/fourn/commande/card.php htdocs/fourn/facture/card.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-03-04 23:03:29 +01:00
Laurent Destailleur	596f977f7c	Merge pull request #2423 from defrance69/patch-49 ... Update index.php	2015-03-04 22:02:16 +01:00
Laurent Destailleur	5f9f536f0b	Merge pull request #2417 from marcosgdf/bug-1892 ... [ bug #1892 ] PHP Fatal error when using USER_UPDATE_SESSION trigger and adding a supplier invoice payment	2015-03-04 22:01:37 +01:00
Laurent Destailleur	8e29dcdb79	Some fix after merging bank account number form	2015-03-04 21:59:03 +01:00
Laurent Destailleur	40adbe5a72	Merge pull request #2420 from aspangaro/develop-patch17 ... NEW: [T1848] Merge bank card & account card	2015-03-04 21:09:28 +01:00
Laurent Destailleur	0ebcf86170	Merge pull request #2421 from aspangaro/develop-patch18 ... Typo "Copytight"	2015-03-04 20:54:13 +01:00
Laurent Destailleur	09035c1fee	Merge branch 'fetchobject' of https://github.com/frederic34/dolibarr ... into develop Conflicts: htdocs/includes/tcpdi/fpdf_tpl.php htdocs/projet/card.php	2015-03-04 20:52:54 +01:00
Laurent Destailleur	7a9de0feca	CRLF	2015-03-04 20:45:33 +01:00
Laurent Destailleur	6bf0b9b107	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-03-04 20:35:28 +01:00
Laurent Destailleur	f570cd6b42	Forgot to commit tables	2015-03-04 20:35:08 +01:00
Laurent Destailleur	20d5624440	Closed #2414	2015-03-04 20:34:41 +01:00
Laurent Destailleur	13d8f26247	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/projet/class/project.class.php	2015-03-04 18:58:50 +01:00
Laurent Destailleur	cf3190a4ef	Bad error management	2015-03-04 18:56:57 +01:00
fmarcet	1a02f6aa80	Fix: Masks works with thirdparty type	2015-03-04 18:18:55 +01:00
Laurent Destailleur	081875c4d9	Merge pull request #2383 from aspangaro/3.7-patch4 ... FIXED: Remove condition to show accountancy field on user.	2015-03-04 18:02:09 +01:00
Laurent Destailleur	96de912661	NEW: Add module "Supplier commercial proposals" to requests ... quotation/price to suppliers. Merge branch 'new_ask_price' of https://github.com/atm-ph/dolibarr into atm-ph-new_ask_price Conflicts: htdocs/core/class/commonobject.class.php htdocs/core/class/html.formfile.class.php htdocs/core/tpl/document_actions_post_headers.tpl.php htdocs/core/tpl/objectline_edit.tpl.php htdocs/core/tpl/objectline_view.tpl.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/commande/card.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-03-04 17:54:43 +01:00
Laurent Destailleur	5335a6affa	NEW: Add close date and user for projects.	2015-03-04 16:28:29 +01:00
Marcos García de La Fuente	41c55d1913	Better fix for bug-1825. There are actually a lot to things to escape and escaped methods can make conflict with similar names so it is better to make a md5 to have a unique value	2015-03-04 11:55:17 +01:00
Marcos García de La Fuente	f94f9d1e57	Removed $permtoedit variable	2015-03-04 11:19:45 +01:00
Marcos García de La Fuente	6ec8a38e4a	Removed duplicated code	2015-03-04 10:46:39 +01:00
Marcos García de La Fuente	7a2e60bb65	No need to PHP < 5.3.0 compatibility	2015-03-04 10:45:30 +01:00
Marcos García de La Fuente	a7741350fe	Revert unwanted change	2015-03-04 10:41:40 +01:00
Marcos García de La Fuente	54b6b199c7	Documented missing properties and removed redundant documentation ... (cherry picked from commit 6124f6a)	2015-03-04 10:37:48 +01:00
Marcos García de La Fuente	e1982c54d9	Moved duplicated code to common class	2015-03-04 10:37:47 +01:00
Marcos García de La Fuente	f82df1e634	Refactorred supplier order to match with objectline templates	2015-03-04 10:37:47 +01:00
Marcos García de La Fuente	174f1cb5f7	Refactored supplier invoice line view to fit commonobjectline view	2015-03-04 10:37:47 +01:00
Marcos García de La Fuente	47a151f157	Created supplier invoice line	2015-03-04 10:37:46 +01:00
Marcos García de La Fuente	b84cf4afac	Renamed FactureFournisseurLine to SupplierInvoiceLine	2015-03-04 10:37:46 +01:00
Marcos García de La Fuente	4c08d34bb5	Standardized $rowid as property	2015-03-04 10:37:46 +01:00
Marcos García de La Fuente	b69ce21e3e	Removed duplicated code	2015-03-04 10:37:45 +01:00
Marcos García de La Fuente	b0e728251a	Every line has a $rowid property	2015-03-04 10:37:45 +01:00
Marcos García de La Fuente	c7919a8d08	Removed duplicated code	2015-03-04 10:37:45 +01:00
Marcos García de La Fuente	ad72425291	Moved some variables from FactureLigne to CommonInvoiceLine	2015-03-04 10:37:43 +01:00
Marcos García de La Fuente	0170d409d3	Merge remote-tracking branch 'upstream/develop' into develop ... Conflicts: htdocs/core/lib/functions.lib.php	2015-03-04 10:16:25 +01:00
Florian HENRY	14847e2b5d	Better column order	2015-03-04 10:08:13 +01:00
Florian HENRY	fdbb0ace8b	NEW : Add company information into category contact export	2015-03-04 10:00:37 +01:00
Florian HENRY	28f6197ac5	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-03-04 09:58:09 +01:00
Laurent Destailleur	4c1d51bd39	phpcs	2015-03-04 02:28:16 +01:00
Laurent Destailleur	6f96d4cd5c	Minimum style	2015-03-04 02:18:20 +01:00
Laurent Destailleur	2c3a412c3a	Fix export extrafield on supplier orders	2015-03-04 02:08:51 +01:00
Laurent Destailleur	52425648bf	NEW: When using transfer or correct stock from warehouse, after ... recording we go back to the warehouse page.	2015-03-04 01:54:26 +01:00
Laurent Destailleur	60a6d8789f	Merge remote-tracking branch 'origin/3.7' into develop	2015-03-04 01:14:27 +01:00
Laurent Destailleur	fa2e57eaa3	pcpcs	2015-03-04 01:10:23 +01:00
Laurent Destailleur	107a16ed75	Work on timesheet module	2015-03-04 00:53:35 +01:00
Laurent Destailleur	fddbca50b1	Start to introduce MAIN_EMAIL_ADD_TRACK_ID option to test inclusion of ... tracking id into email.	2015-03-03 18:33:53 +01:00
Florian HENRY	ae8ca9e96a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-03-03 17:55:57 +01:00
Laurent Destailleur	35733c4c08	More comments	2015-03-03 17:47:17 +01:00
BENKE Charles	06b7f610ed	Update index.php ... list of cossumed time more usefull if ordered by desc	2015-03-03 17:18:20 +01:00
guillaume	5a5a2f1bcf	Affichage de la liste des tables dans les infos de base de données.	2015-03-03 15:54:55 +01:00
guillaume	1b89b8c808	Ajout de la liste des paramètres en utilisant l'instruction PRAGMA	2015-03-03 15:22:52 +01:00
guillaume	e4edafd42a	Ajout de la liste des paramètres en utilisant l'instruction PRAGMA	2015-03-03 15:21:14 +01:00
guillaume	8de170bfc2	Ajout de fonctions pour le traitement des dates avec SQLITE.	2015-03-03 13:06:20 +01:00
aspangaro	022d051726	Typo	2015-03-03 06:32:46 +01:00
aspangaro	42e43791ef	Add ajax for type on edit mode	2015-03-03 06:20:09 +01:00
aspangaro	fafebf5b2a	NEW: [T1758] Merge bank card & account card	2015-03-02 22:44:11 +01:00
aspangaro	c119ce382e	Merge remote-tracking branch 'Upstream/develop' into develop-loan ... Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-03-02 21:05:38 +01:00
Laurent Destailleur	7050ef6176	Fix parameter notolderthan was not effective	2015-03-02 17:56:37 +01:00
frederic34	4af26c119f	fetch object in include file	2015-03-02 17:54:35 +01:00
Laurent Destailleur	79023cddb0	Fix external calendar for users were not visible if no global calendar ... was set.	2015-03-02 17:34:50 +01:00
Marcos García de La Fuente	77605bce3e	[ bug #1892 ] PHP Fatal error when using USER_UPDATE_SESSION trigger and adding a supplier invoice payment	2015-03-02 13:33:31 +01:00
Florian HENRY	d80a8bbdba	revert bug1840 to eldy solution	2015-03-02 10:13:06 +01:00
Florian HENRY	d9621a1d23	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 ... Conflicts: htdocs/contrat/card.php	2015-03-02 10:02:54 +01:00
Laurent Destailleur	73afe1513d	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/commande/card.php htdocs/core/lib/functions.lib.php htdocs/projet/index.php	2015-03-02 03:07:19 +01:00
Laurent Destailleur	48356005c3	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-03-02 03:00:29 +01:00
Laurent Destailleur	3475433eaf	Fix: the bank information were visible into pdf but were not using ... correct setup to decide which bank to show.	2015-03-02 02:59:59 +01:00
Laurent Destailleur	1493e66d64	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-03-02 02:39:29 +01:00
Laurent Destailleur	45a90b54fe	Fix: param to set id of object into url must be id everywhere (except ... company, it might be socid)	2015-03-02 02:14:18 +01:00
Laurent Destailleur	c0d0fa317b	Merge pull request #2404 from frederic34/patch-3 ... Update card.php	2015-03-02 02:05:40 +01:00
Laurent Destailleur	5a541c4206	Forgot to commit one file	2015-03-02 01:39:08 +01:00
Laurent Destailleur	2f24622a7c	NEW: Introduce TCPDI as replacement of FPDI.	2015-03-02 01:38:40 +01:00
Marcos García de La Fuente	7876238823	Fixed bug with hide/show checkboxes reported by Ruben Almeida (aruben) ... When an external calendar was called "mytasks", Dolibarr events were also hidden too.	2015-03-02 01:36:27 +01:00
Marcos García de La Fuente	e6c8cac381	Removed TODO and deprecated tag of dol_htmlentities and revert substitution commit	2015-03-02 01:16:35 +01:00
Marcos García de La Fuente	eb99202dc2	Little changes	2015-03-02 01:10:31 +01:00
Laurent Destailleur	ba98f6f94a	Fix: Bad management of error	2015-03-02 01:05:12 +01:00
Laurent Destailleur	495d066cfc	Merge pull request #2378 from aspangaro/develop-patch6 ... Update TCPDF library to 6.2.6	2015-03-02 00:45:50 +01:00
Laurent Destailleur	9b2a90b468	Fix: all home area pages has the search box first.	2015-03-02 00:43:17 +01:00
Laurent Destailleur	2dcbb6ada5	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-03-02 00:41:57 +01:00
Laurent Destailleur	ef89ff6601	Merge pull request #2402 from aspangaro/develop-patch14 ... NEW: Add a search field and report on hrm area	2015-03-02 00:41:43 +01:00
Laurent Destailleur	0774669331	Update comment	2015-03-02 00:37:47 +01:00
Laurent Destailleur	f81cb81e67	Merge pull request #2405 from frederic34/patch-5 ... phpcs	2015-03-02 00:31:50 +01:00
Laurent Destailleur	ce8cbee5d2	Merge pull request #2399 from marcosgdf/misc ... misc	2015-03-02 00:31:27 +01:00
Laurent Destailleur	50d8137618	Merge pull request #2384 from marcosgdf/better-practice ... Better practice in getBrowserInfo	2015-03-02 00:28:40 +01:00
Laurent Destailleur	6d3381bfa0	Merge pull request #2398 from marcosgdf/deprecated ... Marked getStaticMember as deprecated	2015-03-02 00:23:36 +01:00
Laurent Destailleur	7fc0c2b485	Merge pull request #2397 from atm-alexis/new_add_doc_on_project_linked_elements ... New add doc on project linked elements	2015-03-02 00:19:21 +01:00
aspangaro	e24a317f0f	NEW: Add bank account owner in invoice/proposal/orders footer	2015-03-01 21:31:03 +01:00
Laurent Destailleur	a0f8b39250	Prepare code for a perday week timesheet input of time spent.	2015-03-01 17:45:36 +01:00
Laurent Destailleur	416e0a766e	Fix: we must use status to find label of status	2015-03-01 16:24:02 +01:00
Laurent Destailleur	2795d27cc9	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/fourn/commande/card.php htdocs/langs/en_US/admin.lang htdocs/projet/index.php	2015-03-01 16:13:22 +01:00
Laurent Destailleur	8a67a3af10	Fix missing one param	2015-03-01 16:12:55 +01:00
Laurent Destailleur	8a00109baf	Fix: Several bugs int replenishment feature.	2015-03-01 16:05:20 +01:00
Laurent Destailleur	560f1a43cd	Fix: Several bugs int replenishment feature.	2015-03-01 16:04:34 +01:00
Laurent Destailleur	5f29942257	Fix link missing icon	2015-03-01 14:03:14 +01:00
Laurent Destailleur	9b0dce2e34	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/core/lib/agenda.lib.php	2015-03-01 13:58:56 +01:00
Laurent Destailleur	be033c1947	Fix bad position of html tags ... Conflicts: htdocs/opensurvey/card.php	2015-03-01 13:54:24 +01:00
Laurent Destailleur	a421564b84	Fix phpcs	2015-03-01 13:52:58 +01:00
Laurent Destailleur	f6314dd3ad	Fix bad position of html tags	2015-03-01 13:48:45 +01:00
Laurent Destailleur	f2fb040a9c	Fix align	2015-03-01 13:48:00 +01:00
Marcos García de La Fuente	b4c84fac9d	NEW: [ task #977 ] New option to manage product unit ... Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements	2015-03-01 12:42:38 +01:00
Laurent Destailleur	b888a04af9	Reduce a lot of duplicate code. Move all tables of extrafields setup ... into a tpl file.	2015-02-28 20:14:26 +01:00
Laurent Destailleur	f8e9a38e5c	Fix: Avoid empty table into setup when module are missing.	2015-02-28 19:37:44 +01:00
Marcos García de La Fuente	c925b09946	CodeSniffer fix	2015-02-28 19:26:41 +01:00
Laurent Destailleur	51fff77355	Fix: time 0 must be different than time unknown.	2015-02-28 19:02:03 +01:00
Laurent Destailleur	7baaf18ad1	Fix can be null	2015-02-28 18:44:06 +01:00
Laurent Destailleur	1c9eec1a17	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-02-28 18:18:58 +01:00
Laurent Destailleur	1cdd77a671	Fix: use bad var	2015-02-28 18:18:41 +01:00
Laurent Destailleur	804058c25e	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-02-28 18:10:54 +01:00
Laurent Destailleur	4d226885cb	Rewrite code for supplier order and invoice to use shared code of ... customer supplier and invoice. Work on extrafield for supplier order and invoice.	2015-02-28 18:10:31 +01:00
Marcos García de La Fuente	60e2524fc2	Merge remote-tracking branch 'upstream/develop' into better-practice ... Conflicts: htdocs/core/lib/functions.lib.php test/phpunit/FunctionsLibTest.php	2015-02-28 14:39:14 +01:00
Marcos García de La Fuente	2ba795fcbc	NEW: [ task #851 ] Add a new field: Commercial name	2015-02-28 14:30:06 +01:00
Frédéric FRANCE	eb2cc110fc	phpcs	2015-02-28 10:49:14 +01:00
Frédéric FRANCE	84b5888cd5	Update card.php	2015-02-28 10:45:48 +01:00
aspangaro	105dcde7aa	Key language	2015-02-28 08:50:47 +01:00
aspangaro	78af862c19	NEW: Add a search field and report on hrm area	2015-02-28 08:46:40 +01:00
Laurent Destailleur	8e26c71fa7	Rewrite code for supplier order and invoice to use shared code of ... customer supplier and invoice. Work on extrafield for supplier order and invoice.	2015-02-28 04:59:27 +01:00
Laurent Destailleur	ef14e4e7ed	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/compta/facture.php htdocs/fourn/class/fournisseur.product.class.php	2015-02-28 03:11:15 +01:00
Juanjo Menent	a67d0f712c	Trad: Syncro from transifex	2015-02-27 18:21:41 +01:00
Juanjo Menent	8c6ee6b7a8	Trad: Syncro from transifex	2015-02-27 18:20:35 +01:00
Juanjo Menent	856c8f24de	Fix: Bad SEPA xml file creation ... Conflicts: htdocs/compta/prelevement/class/bonprelevement.class.php	2015-02-27 18:14:45 +01:00
Juanjo Menent	88d1d203d8	Fix: Bad SEPA xml file creation ... Conflicts: htdocs/compta/prelevement/class/bonprelevement.class.php	2015-02-27 18:13:24 +01:00
Laurent Destailleur	5d1545ad1f	Work on supplier order and customer extrafields ... Use templates to show/edit supplier order and invoice lines	2015-02-27 18:05:12 +01:00
Juanjo Menent	7ca8fdb20c	PHP norms	2015-02-27 17:58:19 +01:00
Juanjo Menent	bfe9bf7a47	Fix: Bad SEPA xml file creation	2015-02-27 17:55:15 +01:00
guillaume	4ede9295a6	Correction de la gestion d'erreur.	2015-02-27 14:06:53 +01:00
aspangaro	8f388aaa9b	Merge remote-tracking branch 'Upstream/3.7' into 3.7-patch4	2015-02-26 20:48:21 +01:00
aspangaro	47c41f6a85	Add a test to enable field only when module salary is used	2015-02-26 20:47:06 +01:00
Laurent Destailleur	828716420b	Comment of function was not correct	2015-02-26 16:19:45 +01:00
Laurent Destailleur	a87c867c28	Translation	2015-02-26 16:02:03 +01:00
Laurent Destailleur	8f378b4480	Fix no error returned when contact already exists	2015-02-26 15:52:14 +01:00
Laurent Destailleur	d6438a51ab	Add log to help track bug	2015-02-26 15:24:15 +01:00
Laurent Destailleur	4bde7e9f51	Fix: Missing error management	2015-02-26 14:25:30 +01:00
Laurent Destailleur	22318bb800	Fix missing tables	2015-02-26 14:05:23 +01:00
Laurent Destailleur	daabc113a5	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: README.md htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/cashjournal.php	2015-02-26 13:36:07 +01:00
Laurent Destailleur	fe7889e266	Fix trigger to insert lines where called when inserting line but also ... when cloning parent object, making no way to know when to use them or not. I introduced a context to allow code to know that and do not triggers twice.	2015-02-26 13:19:19 +01:00
Laurent Destailleur	41a74c62e2	Fix trigger to insert lines where called when inserting line but also ... when cloning parent object, making no way to know when to use them or not. I introduced a context to allow code to know that and do not triggers twice.	2015-02-26 13:03:17 +01:00
Laurent Destailleur	386eaf0911	Fix: bad sql request	2015-02-26 12:11:31 +01:00
Laurent Destailleur	b9d3175897	Fix typo	2015-02-25 23:04:13 +01:00
Marcos García de La Fuente	f117b65a17	Removed silent operator for PHP 4 in function dol_html_entity_decode	2015-02-25 23:01:07 +01:00
Marcos García de La Fuente	f2fededd2c	Drop usage of deprecated dol_htmlentities function	2015-02-25 22:48:45 +01:00
Marcos García de La Fuente	e3853a648f	Redundant code	2015-02-25 19:44:12 +01:00
Marcos García de La Fuente	fb959abc63	Misc PHPdoc fixes	2015-02-25 18:24:36 +01:00
Marcos García de La Fuente	0a5f17f179	Undefined variable + Unreachable statement	2015-02-25 18:06:54 +01:00
Marcos García de La Fuente	91fa823075	Marked getStaticMember as deprecated	2015-02-25 18:03:31 +01:00
Laurent Destailleur	be529e7269	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-02-25 16:53:33 +01:00
Marcos García de La Fuente	40a5c15616	Improved getBrowserInfo documentation	2015-02-25 16:45:14 +01:00
Marcos García de La Fuente	f598963d6b	Fixed regression	2015-02-25 16:41:51 +01:00
guillaume	9839420a68	Correction de la gestion d'erreur.	2015-02-25 15:44:06 +01:00
Laurent Destailleur	76640b6b77	Fix removed warning	2015-02-25 15:01:25 +01:00
guillaume	24b069fcb0	Utilisation de la librairie Sqlite3 et création de fonctions personnalisées pour la compatibilité avec MySQL. Certains formats de date ne sont pas complètement pris en compte.	2015-02-25 14:31:41 +01:00
guillaume	207fa671b1	Mise en place de l'initialisation de la base avec PDO SQlite	2015-02-25 09:04:11 +01:00
aspangaro	4803a1fb89	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2015-02-25 06:59:27 +01:00
Laurent Destailleur	89684748c5	Debug incdec option.	2015-02-24 19:55:59 +01:00
Alexis Algoud	5bc3763945	fix supplier order element	2015-02-24 18:23:40 +01:00
Alexis Algoud	b4f3068141	NEW add PDF icon on linked element into project	2015-02-24 18:20:19 +01:00
Laurent Destailleur	1c04af2e55	Merge branch 'feature_Product_stock_subproduct_stock_independent' of ... https://github.com/atm-alexis/dolibarr into atm-alexis-feature_Product_stock_subproduct_stock_independent Conflicts: htdocs/langs/en_US/products.lang	2015-02-24 17:23:23 +01:00
Laurent Destailleur	3fb3e4af4e	Merge pull request #2386 from lrq3000/3.7 ... Fix lastrowid-*table* option when defining imports	2015-02-24 17:16:17 +01:00
Laurent Destailleur	fec9e222b1	Merge pull request #2391 from aspangaro/develop-patch10 ... FIXED: Module Expense Report - Correct init	2015-02-24 17:11:32 +01:00
Laurent Destailleur	72da9b52af	Merge pull request #2380 from marcosgdf/bug-1825 ... Better fix for bug 1825	2015-02-24 17:07:17 +01:00
Laurent Destailleur	fd9fc191fc	Merge pull request #2388 from aspangaro/develop-patch8 ... Module Expense Report: reactivate conflict with modDeplacement	2015-02-24 17:06:43 +01:00
Laurent Destailleur	625c494dee	Merge pull request #2385 from aspangaro/3.7-patch5 ... FIXED: Bankjournal is generated from id_account now	2015-02-24 17:04:01 +01:00
Laurent Destailleur	f23234356e	Merge pull request #2387 from aspangaro/develop-patch7 ... Move new module Expense Report in hrm	2015-02-24 17:03:12 +01:00
Laurent Destailleur	e8e81dba2b	Merge pull request #2392 from aschio/develop ... NEW: added fields and relative filters in contracts list page	2015-02-24 17:02:47 +01:00
Laurent Destailleur	84581212db	Merge pull request #2395 from aspangaro/develop-patch13 ... NEW: Add button to purge search criteria into list of expense report	2015-02-24 17:02:08 +01:00
Laurent Destailleur	57ecb543ae	Merge pull request #2393 from aspangaro/develop-patch11 ... FIXED: Correct field note - Add note_private & use wysiwyg editor	2015-02-24 17:01:53 +01:00
Laurent Destailleur	203ff13a62	Merge branch 'develop' of https://github.com/mrsof/dolibarr into ... mrsof-develop Conflicts: htdocs/comm/card.php	2015-02-24 17:00:52 +01:00
Laurent Destailleur	714b3d277c	Merge pull request #2394 from aspangaro/develop-patch12 ... FIXED: Update licence to GPLv3	2015-02-24 16:56:01 +01:00
Laurent Destailleur	70c778c728	I keep this feature hidden, because according to package target, ... dolibarr does not contains same files. We must first find a solution before making this feature public.	2015-02-24 15:49:39 +01:00
Laurent Destailleur	562348eb34	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/fourn/commande/dispatch.php	2015-02-24 15:42:28 +01:00
Laurent Destailleur	74f15680e1	Fix missing fields into import of thirdparties. ... Fix import failed to find type of companny from source file. Fix import date of creation has wrong check rule.	2015-02-24 15:40:50 +01:00
Sof	5599deec00	FIX : Edit in place of "Outstanding Limit" ... Edit in place not working for field "Outstanding Limit" in view mode for third party : - Field type 'amount' do not work in "Edit in place" mode. - Update returns an error "Unknown field 'OutstandingBill' in field list" when in "Edit in place" mode.	2015-02-24 13:44:00 +01:00
Laurent Destailleur	44c392ca23	Fix missing profid5 and 6	2015-02-24 13:35:37 +01:00
Laurent Destailleur	e55d3489aa	Little clean of feature several price per customers	2015-02-24 12:58:43 +01:00
Laurent Destailleur	cae82104ca	Clean tool to generate checksum file	2015-02-24 12:44:12 +01:00
Laurent Destailleur	4e4df4fa22	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-02-24 11:25:32 +01:00
Laurent Destailleur	9842e816d0	Fix bad sql type ... Fix no input outside tr-td	2015-02-24 11:24:15 +01:00
Laurent Destailleur	eb4eededbd	Add class to manage table commande_fournisseur_dispatch	2015-02-24 11:19:47 +01:00
Laurent Destailleur	472181a03b	Merge pull request #2374 from frederic34/filecheck ... Files Integrity Checker	2015-02-24 10:08:39 +01:00
Laurent Destailleur	bbc82e829b	Fix bad sql request	2015-02-23 23:28:55 +01:00
Laurent Destailleur	0a5c3e1fa8	Fix price must be hidden if context is not on sell	2015-02-23 23:15:41 +01:00
aspangaro	15aac509d2	NEW: Add button to purge search criteria into list	2015-02-23 22:36:26 +01:00
aspangaro	6436179fb6	Correct	2015-02-23 22:18:39 +01:00
aspangaro	c1069eea47	FIXED: Update licence to GPLv3	2015-02-23 22:04:01 +01:00
aspangaro	40fa32509c	Add doleditor & typo	2015-02-23 21:51:29 +01:00
aspangaro	9dadd16724	FIXED: Correct problem field with note - Add note_private & use wysiwyg editor	2015-02-23 21:44:33 +01:00
aspangaro	be3fd5529a	FIXED: Module Expense Report - Correct init	2015-02-23 20:31:44 +01:00
cla	2ef654045b	ADD: new fields and relative filters in contracts list page	2015-02-23 20:26:34 +01:00
Laurent Destailleur	afa8e5c6d8	Merge remote-tracking branch 'origin/3.7' into develop	2015-02-23 19:50:51 +01:00
Laurent Destailleur	4128c86035	Fix: Filter on statut was lost	2015-02-23 19:31:42 +01:00
Laurent Destailleur	94a5f87bd8	comment	2015-02-23 15:13:14 +01:00
Laurent Destailleur	6d3834b3b9	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/index.php htdocs/projet/class/project.class.php test/phpunit/BankAccountTest.php	2015-02-23 14:59:24 +01:00
Laurent Destailleur	d3a79c8724	Fix default entity guess	2015-02-23 14:44:24 +01:00
Laurent Destailleur	570194b4b9	Fix validation of email when there is a comma separator.	2015-02-23 13:10:18 +01:00
Alexis Algoud	29e5b89352	erase some comments	2015-02-23 12:26:27 +01:00
Alexis Algoud	0c53121553	- use incdec into virtual product definition. ... - improve screen of virtual product	2015-02-23 12:19:19 +01:00
phf	9eed66d998	[CORE] FIX : Travis phptest (#incoterm).	2015-02-23 11:46:39 +01:00
Laurent Destailleur	ae8d090ebe	Fix No default filter by default, we miss data	2015-02-23 11:43:38 +01:00
phf	11a0624e39	[CORE] FIX Travis phpcs (#incoterm).	2015-02-23 11:19:00 +01:00
Marcos García de La Fuente	7e07638fba	Little refactor	2015-02-23 10:51:43 +01:00
Alexis Algoud	72908c1fd3	Merge branch 'develop' of https://github.com/atm-gauthier/dolibarr into feature_Product_stock_subproduct_stock_independent	2015-02-23 10:51:41 +01:00
phf	52441914de	Vas avec le merge précédent	2015-02-23 10:42:34 +01:00
Marcos García de La Fuente	71b98ee82b	Safari can appear in iPad, iPod, iPhone and future Apple products, it is not fair to attach it to one of them.	2015-02-23 10:42:10 +01:00
phf	127868899d	Merge branch 'develop' into incoterm ... Conflicts: htdocs/commande/class/commande.class.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-02-23 10:42:01 +01:00
phf	c459794999	[CORE] gestion de l'affichage de l'incoterm sur les différents PDF de base (#incoterm).	2015-02-23 10:36:44 +01:00
phf	81130634d3	[CORE] intégration de incoterm sur les différentes class (#incoterm).	2015-02-23 09:16:14 +01:00
aspangaro	d0cc072a58	Module Expense Report: reactivate conflictwith modDeplacement	2015-02-23 06:49:11 +01:00
aspangaro	95f211775b	Move new module Expense Report in hrm	2015-02-23 06:45:03 +01:00
Laurent Destailleur	dbaef5ca6b	Fix link does not return same number that nmber into link	2015-02-23 01:00:07 +01:00