dolibarr

Author	SHA1	Message	Date
Raphaël Doursenaud	d6e48670e7	Allow replacing the address block Since `ba2c0a2651` changed the default hook mode from addreplace to output, this is needed to still be allowed to replace the displayed address from a hook	2015-06-25 11:13:23 +02:00
Fab	3adf6b1a73	Missing space after title tag. When using textwithpicto() from core/class/html.form.class.php, if you are reading source code with firefox, you will see that a part of the generated html is highlighted in red. <td class="classfortooltip" title="title text"valign="top" width="14"> should be : <td class="classfortooltip" title="title text" valign="top" width="14">	2015-06-25 08:50:48 +02:00
aspangaro	e20da5511d	Accounting - Add field to edit in admin	2015-06-25 06:54:19 +02:00
aspangaro	452733263d	Move ACCOUNTING_VAT_ACCOUNT to ACCOUNTING_VAT_SOLD_ACCOUNT	2015-06-25 06:37:26 +02:00
Laurent Destailleur	1485ead215	Fix: MARGIN_TYPE == 2 is "using PMP price" so i remove a duplicate option to get same behaviour.	2015-06-24 21:36:28 +02:00
Laurent Destailleur	a7aaa89e49	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-06-24 18:33:04 +02:00
Laurent Destailleur	02ce0bc6af	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-06-24 18:32:56 +02:00
Laurent Destailleur	c218843cdb	FIX Save of filters into export profiles failed.	2015-06-24 18:29:29 +02:00
Juanjo Menent	759aec3925	Merge pull request #3084 from aspangaro/develop-patch37 Fix: ER button set_paid & merge with old option setPaid	2015-06-24 18:27:25 +02:00
Juanjo Menent	fc9d54fdaa	Merge pull request #3088 from atm-maxime/develop New : add stats by qty on report turnover by product (+ clean code)	2015-06-24 18:23:31 +02:00
Juanjo Menent	044edaaefc	Merge pull request #3092 from FHenry/develop NEW : add extrafields into import product	2015-06-24 18:20:47 +02:00
Juanjo Menent	9080470a64	Merge pull request #3089 from aspangaro/develop-patch39 Fix travis	2015-06-24 18:18:36 +02:00
Juanjo Menent	1d562be1f4	Merge pull request #3090 from fmarcet/3.7 FIX: Payed invoices are showed as canceled	2015-06-24 18:17:45 +02:00
Laurent Destailleur	fcc9fc6672	Fix translation	2015-06-24 16:54:44 +02:00
Florian HENRY	daab394c81	add extrafields into import product	2015-06-24 12:40:56 +02:00
fmarcet	c9c1247a28	FIX: Payed invoices are showed as canceled FIX: Bad date filter on customer order	2015-06-24 09:01:39 +02:00
aspangaro	b4b5dedaa9	Merge remote-tracking branch 'Upstream/develop' into develop-39	2015-06-24 07:02:48 +02:00
aspangaro	f65234e44f	Fix travis	2015-06-24 07:01:15 +02:00
Laurent Destailleur	0780c84012	Fix missing payment mode into export invoice profile	2015-06-23 23:58:04 +02:00
Laurent Destailleur	bdba8f1f38	Fix courrent outstanding amount not visible	2015-06-23 23:33:25 +02:00
Maxime Kohlhaas	5e9c85c789	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2015-06-23 20:03:46 +02:00
Francis Appels	63df278eca	Fix: issue #3085	2015-06-23 19:28:18 +02:00
Laurent Destailleur	040a643ee9	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/expensereport/card.php htdocs/projet/element.php	2015-06-23 18:34:39 +02:00
Laurent Destailleur	a23e2511b9	Removed useless tab	2015-06-23 18:11:21 +02:00
phf	06962cb4e6	FIX : tool export handle the type "select" extrafields and return the value instead of id	2015-06-23 16:26:05 +02:00
Laurent Destailleur	27cc7ef2b3	Time spent	2015-06-23 10:13:08 +02:00
aspangaro	385857380b	Remove old field	2015-06-23 06:39:55 +02:00
aspangaro	fae0a99a97	Merge remote-tracking branch 'Upstream/develop' into develop-37	2015-06-23 06:17:29 +02:00
Laurent Destailleur	460c926f98	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-06-22 22:32:00 +02:00
Laurent Destailleur	4db562c9e7	Tags are shown as thumbs into card.	2015-06-22 22:31:44 +02:00
Laurent Destailleur	afc4529f7f	Merge pull request #3080 from open-minds/develop Remove useless filter for "text" parameter of boxes content	2015-06-22 20:32:08 +02:00
Maxime Kohlhaas	fdf1d953a9	New : add stats by qty on report turnover by product (+ clean code)	2015-06-22 19:22:13 +02:00
Laurent Destailleur	bfa0f0d576	Minor look enhancement	2015-06-22 17:20:06 +02:00
Laurent Destailleur	cac7b1f49f	NEW Add hooks on list of members to allow an external module to add more fields into list view.	2015-06-22 16:34:25 +02:00
Laurent Destailleur	5a8e763099	Uniformize code for hooks Uniformize page name societe.php into list.php	2015-06-22 15:48:48 +02:00
Laurent Destailleur	ea8279cf09	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-06-22 12:00:09 +02:00
Laurent Destailleur	a27212644e	NEW Can add project search on left menu search area	2015-06-22 11:55:21 +02:00
aspangaro	134cea194d	Debug	2015-06-22 06:53:43 +02:00
Laurent Léonard	ba64486e68	Remove useless filter for "text" parameter of boxes content This filter doesn't allow to display "0" value and is not applied to the similar "text2" parameter.	2015-06-22 02:53:28 +02:00
Laurent Destailleur	6e1a5ca401	Merge pull request #3078 from aspangaro/develop-patch38 Fix: Accountancy list: Use print_liste_field_titre	2015-06-21 23:30:49 +02:00
Laurent Destailleur	5975536fcf	Support type of leave.	2015-06-21 23:25:01 +02:00
aspangaro	e0ae7bd430	Merge remote-tracking branch 'Upstream/develop' into develop-37	2015-06-21 21:09:55 +02:00
Laurent Destailleur	7d1d1caf30	Debug withdraw module	2015-06-21 17:09:00 +02:00
Laurent Destailleur	230fd7a7e4	Debug withdraw module	2015-06-21 17:05:49 +02:00
aspangaro	390c670c5c	Merge remote-tracking branch 'Upstream/develop' into develop-38	2015-06-21 14:35:45 +02:00
aspangaro	2ab454e757	Presentation	2015-06-21 14:32:00 +02:00
Laurent Destailleur	2612585d1c	Merge pull request #3073 from atm-alexis/develop FIX hide product category if it's not enable	2015-06-21 11:53:11 +02:00
Laurent Destailleur	8710065ca0	Merge pull request #3072 from atm-maximep/new_set_amount_for_withdraws NEW : Set amount for withdraws requests	2015-06-21 11:52:23 +02:00
aspangaro	0f450edfcd	Debug	2015-06-21 08:32:37 +02:00
aspangaro	0934860ce5	Accountancy list: Use print_liste_field_titre	2015-06-21 08:26:42 +02:00
aspangaro	f0a3057221	Fix: ER button set_paid & merge with old option setPaid	2015-06-21 08:07:06 +02:00
aspangaro	20582b9ea5	Merge remote-tracking branch 'Upstream/develop' into develop-36	2015-06-21 07:31:43 +02:00
Laurent Destailleur	d780c03651	Fix default buttone	2015-06-21 03:47:16 +02:00
Laurent Destailleur	4f1538f502	Introduce table llx_c_holiday_type	2015-06-21 03:19:15 +02:00
Laurent Destailleur	e0d1cbeb16	Introduce table llx_c_holiday_type	2015-06-21 00:07:03 +02:00
Laurent Destailleur	a3a5b0d9b0	Upgrade jquery and jquery-ui to last stable version	2015-06-21 00:06:37 +02:00
Laurent Destailleur	825369230f	Finishment of look	2015-06-20 23:33:13 +02:00
Laurent Destailleur	2c5ef858d0	NEW Filter "active" by default on user list. Fix label of permission of project module	2015-06-20 20:35:57 +02:00
Laurent Destailleur	40d17add22	Fix missing print	2015-06-20 19:42:07 +02:00
Laurent Destailleur	87b4381d47	Update jflot plugin	2015-06-20 19:17:50 +02:00
Laurent Destailleur	1cb9d3b2eb	Fix nohover for lines to add lines	2015-06-20 17:40:36 +02:00
Laurent Destailleur	a6a027f5c4	Fix several pb with javascript	2015-06-20 17:24:34 +02:00
Laurent Destailleur	c2568020a5	Fix IBAN class is uppercase	2015-06-20 17:23:41 +02:00
Laurent Destailleur	32626c5ae6	Fix js refresh with autocomplete	2015-06-20 17:23:28 +02:00
Laurent Destailleur	ba5d6318ef	Debug the integrity check feature.	2015-06-20 14:24:22 +02:00
Laurent Destailleur	a7ce414d23	Fix translation	2015-06-20 14:15:32 +02:00
aspangaro	0ff97da1ea	Review ER : remove fk_c_tva and add option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT	2015-06-20 09:06:20 +02:00
Laurent Destailleur	2895241420	Update theme with 3.8	2015-06-19 17:03:35 +02:00
Laurent Destailleur	bbce287892	Fix: Pdf merge tool must see only pdf files	2015-06-19 16:05:04 +02:00
Alexis Algoud	d0999e5458	FIX hide category if it's not enable	2015-06-19 14:30:23 +02:00
maxime peyrot	f99a127a57	NEW : Enter amount for withdraws requests	2015-06-19 13:45:14 +02:00
Laurent Destailleur	2785bf7520	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-06-19 12:13:39 +02:00
Laurent Destailleur	b3c1ebf30a	Debug price per customer	2015-06-19 12:13:05 +02:00
Laurent Destailleur	694481ae5e	Merge pull request #3071 from aspangaro/develop-patch35 Review accountancy	2015-06-19 11:29:01 +02:00
Laurent Destailleur	5376c771d7	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-06-19 11:27:59 +02:00
Laurent Destailleur	01fbee0e06	Merge branch 'develop-patch34' of https://github.com/aspangaro/dolibarr into aspangaro-develop-patch34 Conflicts: htdocs/comm/action/class/actioncomm.class.php	2015-06-19 11:27:15 +02:00
Laurent Destailleur	eac822d821	Merge pull request #3069 from aspangaro/develop-patch33 Fix: Accountancy - SQL error & typo	2015-06-19 11:23:43 +02:00
Laurent Destailleur	44d4d23c00	Fix phpcs	2015-06-19 11:21:36 +02:00
Laurent Destailleur	bfc8ccd761	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-06-19 11:19:23 +02:00
Laurent Destailleur	20da120a49	Merge tab to upload photo and other files to same tab. This reduce duplicate code and avoid users to be lost.	2015-06-19 11:19:13 +02:00
Laurent Destailleur	0d7fea70a0	Merge pull request #3068 from atm-alexis/develop FIX can receive new batch product on supplier order	2015-06-19 11:17:59 +02:00
Laurent Destailleur	b39d100e53	Merge pull request #3067 from All-3kcis/patch-1 FIX complete function ordersupplier_prepare_head() so a module can remove tabs	2015-06-19 11:16:15 +02:00
Laurent Destailleur	5d585393ef	Merge pull request #3065 from aspangaro/develop-patch32 New: Add payment into expense report card - Link to the bank module	2015-06-19 11:15:14 +02:00
Laurent Destailleur	d99fd37f3d	Merge pull request #3061 from marcosgdf/bug-timezone-2 Corrected Timezone detection by using jstz external library	2015-06-19 11:13:50 +02:00
aspangaro	ceaa71649c	Review customer list ventilation page	2015-06-19 06:56:21 +02:00
aspangaro	14ad53848d	Remove $linkback, lang & html	2015-06-19 06:32:51 +02:00
aspangaro	0c01295016	Fix travis	2015-06-19 06:19:10 +02:00
aspangaro	f60ca03140	Fix travis	2015-06-19 06:11:32 +02:00
aspangaro	22d81dec60	Merge remote-tracking branch 'Upstream/develop' into develop-32	2015-06-19 06:10:18 +02:00
aspangaro	fb57941b21	typo	2015-06-19 06:06:46 +02:00
aspangaro	4bda3a3f21	Merge remote-tracking branch 'Upstream/develop' into develop-33	2015-06-19 06:04:56 +02:00
aspangaro	d959c552f2	Fix: Accountancy - SQL error	2015-06-19 06:01:42 +02:00
Laurent Destailleur	b5cc7ae1c8	Work on merge tab photos and attached files	2015-06-19 00:52:58 +02:00
Laurent Destailleur	d8f86708b1	Minor look fix	2015-06-19 00:36:03 +02:00
Laurent Destailleur	bbc70004d9	Disable option that i can't understand.	2015-06-19 00:18:41 +02:00
Alexis Algoud	21f0fc8229	FIX can receive new batch product on supplier order	2015-06-18 19:49:19 +02:00
Laurent Destailleur	425d9bff48	Tooltip to make understanding better.	2015-06-18 19:33:29 +02:00
All-3kcis	c96c528d3e	Correction complete_head Ajout de la fonction complete_head_from_modules() pour supprimer les onglets si besoin.	2015-06-18 15:16:28 +02:00
Laurent Destailleur	7507a71121	Lenght of fields	2015-06-18 14:47:33 +02:00
Laurent Destailleur	29422a9ff9	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-06-18 14:25:31 +02:00
Laurent Destailleur	a2e9ebe2d1	Fix hover is ok on boxes array too.	2015-06-18 14:25:13 +02:00
aspangaro	7539ad88fa	Debug	2015-06-18 06:30:48 +02:00
aspangaro	9cf06ec21c	Add function set_paid	2015-06-18 06:12:05 +02:00
Regis Houssin	9c6c3ad65d	Fix: wrong user right	2015-06-17 16:33:18 +02:00
aspangaro	50aa36502c	Merge remote-tracking branch 'Upstream/develop' into develop-32 Conflicts: htdocs/expensereport/card.php	2015-06-17 07:21:43 +02:00
aspangaro	8d0e7261f5	Debug	2015-06-17 07:19:25 +02:00
Laurent Destailleur	b2c1365eca	Merge pull request #3056 from defrance69/patch-65 added ref supplier bill	2015-06-17 00:18:38 +02:00
Marcos García de La Fuente	1e05262884	Corrected Timezone detection by using jstz external library	2015-06-16 21:19:58 +02:00
Florian HENRY	6819e295f5	default charset utf-8	2015-06-16 20:22:01 +02:00
Laurent Destailleur	8df56511be	NEW Enhance prototype, project list and proposal list with new hook to have an external module able to add more fields.	2015-06-16 19:36:44 +02:00
fmarcet	05cb1f7ba7	Fix: Date filter on customer orders	2015-06-16 16:59:48 +02:00
Regis Houssin	3807fafc1a	Fix: no error message if extrafield is require	2015-06-16 16:42:33 +02:00
BENKE Charlie	94341e83ed	added ref supplier bill more useful to match supplier bill than internal ref	2015-06-16 15:22:13 +02:00
Laurent Destailleur	b7c777dc07	Css fix	2015-06-16 15:14:33 +02:00
Laurent Destailleur	ef5ff2f218	Use the complete popup on user in user list and hierarchy view.	2015-06-16 15:08:20 +02:00
Laurent Destailleur	a52be15722	Enhance look for left menu seach form when HTML5 is on	2015-06-16 13:09:46 +02:00
Laurent Destailleur	fb1a3f3ea3	Rename alternative name	2015-06-16 12:04:11 +02:00
Laurent Destailleur	8b4e3096a6	Merge pull request #2412 from marcosgdf/commercial-name NEW [ task #851 ] Add a new field: Commercial name	2015-06-16 11:44:03 +02:00
Laurent Destailleur	d3549cc2a0	Merge branch 'add_clone_on_event_agenda' of https://github.com/atm-gauthier/dolibarr into atm-gauthier-add_clone_on_event_agenda Conflicts: htdocs/langs/en_US/agenda.lang	2015-06-16 11:41:45 +02:00
Laurent Destailleur	ceb0d71f54	Merge pull request #3054 from hregis/3.7_photos Fix: thumb "mini" not deleted	2015-06-16 11:38:39 +02:00
Laurent Destailleur	417eae9c4f	Merge remote-tracking branch 'origin/3.7' into develop	2015-06-16 11:18:51 +02:00
Laurent Destailleur	34468644ef	Merge remote-tracking branch 'origin/3.5' into 3.6	2015-06-16 11:15:16 +02:00
Laurent Destailleur	9281e2a824	Merge pull request #3049 from marcosgdf/task-1191 NEW [ task 1191 ] AJAX selector for projects	2015-06-16 11:09:34 +02:00
Laurent Destailleur	dd661ca716	Merge pull request #3053 from aspangaro/develop-patch30 Fix: ER Missing language key	2015-06-16 11:08:21 +02:00
Laurent Destailleur	609eb26151	Merge pull request #3051 from aternatik/api Changes into API	2015-06-16 11:08:14 +02:00
Regis Houssin	5e25c69891	Fix: thumb "mini" not deleted	2015-06-16 09:28:31 +02:00
Marcos García de La Fuente	45ebb18367	CodeSniffer corrections	2015-06-16 07:19:31 +02:00
aspangaro	2979815223	Update work on expensereport card	2015-06-16 06:56:58 +02:00
aspangaro	a1e383dafa	Fix: ER Missing language key	2015-06-16 06:18:43 +02:00
aspangaro	d92eab49de	Add the payment in bank module	2015-06-16 05:47:24 +02:00
aspangaro	2fb27b50ec	Add payment page & class	2015-06-16 05:47:22 +02:00
aspangaro	a23994055a	Add field and table in database & migration script	2015-06-16 05:47:19 +02:00
Laurent Destailleur	c56c228c7f	Merge pull request #2924 from aternatik/api_rest Allow modify API key from user card	2015-06-15 21:25:15 +02:00
Laurent Destailleur	cbac2dd63c	Merge pull request #3052 from aternatik/fix_crlf Fix crlf	2015-06-15 21:24:34 +02:00
jfefe	3bf1b60be8	Add test if module enabled before showing API information	2015-06-15 14:38:02 +02:00
jfefe	190ee35e86	Merge branch 'develop' into api_rest Conflicts: htdocs/user/card.php htdocs/user/class/user.class.php	2015-06-15 14:29:34 +02:00
jfefe	745f0f7d7e	Fix crlf	2015-06-15 14:24:24 +02:00
jfefe	80a6afc577	Add htaccess example for API usage	2015-06-15 14:11:53 +02:00
jfefe	00125d1060	Add option to set production mode to API	2015-06-15 14:11:43 +02:00
jfefe	da0fac2ac6	Minor fix into rest API : use implemented method name	2015-06-15 13:25:02 +02:00
Regis Houssin	d92448a772	Fix: phpcs ?	2015-06-15 12:09:32 +02:00
Marcos García de La Fuente	65d3f7968a	NEW [ task 1191 ] AJAX selector for projects	2015-06-15 10:04:36 +02:00
Marcos García de La Fuente	2d3ab3b658	Merge remote-tracking branch 'upstream/3.5' into bug-2814-2 Conflicts: ChangeLog	2015-06-15 09:39:17 +02:00
Marcos García	adc1998b73	Fixed undefined variable typo	2015-06-15 09:18:58 +02:00
aspangaro	7ddec85fd2	Merge remote-tracking branch 'Upstream/develop' into develop-30	2015-06-15 05:22:12 +02:00
Laurent Destailleur	bcd254c137	Fix bad objet use. Add label of project into list.	2015-06-15 00:12:52 +02:00
aspangaro	a4acc867aa	Typo "inra_vat"	2015-06-14 20:24:25 +02:00
aspangaro	f973a1fb43	Typo "cibility"	2015-06-14 20:15:22 +02:00
Laurent Destailleur	6263e90ddb	More info on contact popup	2015-06-14 17:38:28 +02:00
Laurent Destailleur	87e07a3038	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: ChangeLog htdocs/compta/bank/virement.php htdocs/core/tpl/objectline_create.tpl.php htdocs/product/card.php htdocs/societe/soc.php	2015-06-14 17:18:45 +02:00
Laurent Destailleur	a7cec18081	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/categories/fiche.php htdocs/core/tpl/objectline_create.tpl.php htdocs/install/upgrade2.php htdocs/product/liste.php	2015-06-14 17:11:36 +02:00
Laurent Destailleur	f4da53c300	Merge remote-tracking branch 'origin/3.5' into 3.6 Conflicts: htdocs/product/liste.php htdocs/product/price.php	2015-06-14 17:04:24 +02:00
Laurent Destailleur	1007aba6a9	Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6	2015-06-14 17:02:11 +02:00
Laurent Destailleur	14a8a2269b	FIX End log must use same level then start log.	2015-06-14 16:59:35 +02:00
Laurent Destailleur	fadc640335	Merge branch 'bug-2835' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2835 Conflicts: ChangeLog	2015-06-14 16:07:19 +02:00
Laurent Destailleur	d0b2c492a0	Merge branch 'bug-2837' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2837 Conflicts: ChangeLog	2015-06-14 16:06:14 +02:00
Laurent Destailleur	e915a54c39	Merge branch 'bug-2861' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2861 Conflicts: ChangeLog	2015-06-14 16:03:44 +02:00
Laurent Destailleur	892ff3b053	Merge branch 'bug-2900' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-2900 Conflicts: ChangeLog	2015-06-14 15:58:16 +02:00
Laurent Destailleur	f8d2e93878	Merge pull request #3044 from hregis/3.5_bug Fix: select date problem with mobile device (#3039)	2015-06-14 15:29:35 +02:00
Laurent Destailleur	b42f9a6706	Fix phpcs	2015-06-14 15:16:29 +02:00
Regis Houssin	b96ed08260	Fix: select date problem with mobile device (#3039 )	2015-06-14 12:46:27 +02:00
Regis Houssin	0e79bd5c74	Fix: select date problem with mobile device (#3039 )	2015-06-14 12:34:28 +02:00
Laurent Destailleur	ec5330120c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-06-14 02:17:56 +02:00
Laurent Destailleur	fdced80a48	Merge pull request #3035 from marcosgdf/bug-2786 FIX #2786 Objectline_add template shows "0" for non-vat suppliers	2015-06-14 02:15:27 +02:00
Laurent Destailleur	aecc5d27a3	Merge pull request #3036 from hregis/3.7_bug Fix: broken feature: barcode search #3019	2015-06-14 02:09:40 +02:00
Laurent Destailleur	a9bf38b8d3	Merge pull request #3022 from marcosgdf/bug-2976 FIX Close bug #2976: "Report" tab is the current tab but it is not marked as selected by the UI	2015-06-14 02:03:39 +02:00
Laurent Destailleur	c5dd3f4468	Merge pull request #3013 from GPCsolutions/dolibarr-2899 Fix #2899: Reintroduce missing field	2015-06-14 02:03:23 +02:00
Laurent Destailleur	03d1b4bac0	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-06-14 01:52:59 +02:00
Laurent Destailleur	f67af6dac5	Merge pull request #3026 from marcosgdf/bug-2891 FIX Close bug #2891 Category hooks do not work	2015-06-14 01:40:12 +02:00
Laurent Destailleur	d5c26af563	Missing nohover css	2015-06-13 20:26:49 +02:00
Marcos García de La Fuente	6514f418e5	Fix [ bug 1852 ] JS error when editing a customer order line	2015-06-13 11:46:35 +02:00
Regis Houssin	f5168625d8	Fix: broken feature: barcode search #3019	2015-06-13 10:43:55 +02:00
Regis Houssin	296b76603a	Merge remote-tracking branch 'origin/3.7' into 3.7_bug	2015-06-13 09:37:55 +02:00
Marcos García de La Fuente	ea625628ce	Fix Close bug #2786 Objectline_add template shows "0" for non-vat suppliers	2015-06-13 03:39:06 +02:00
Marcos García de La Fuente	1215502927	Fix Close bug #2814 JPEG photos are not displayed in Product photos page	2015-06-13 03:11:17 +02:00
Marcos García de La Fuente	a496606826	Merge branch 'develop' into commercial-name Conflicts: htdocs/societe/soc.php	2015-06-13 02:45:42 +02:00
Marcos García de La Fuente	7bddca94ef	Merge branch '3.7' into bug-2900 Conflicts: ChangeLog	2015-06-13 02:39:16 +02:00
Juanjo Menent	5edfef2525	Merge pull request #3006 from hregis/develop_productprice Fix: disable hook calling	2015-06-12 21:38:14 +02:00
Juanjo Menent	deff75d2ac	Merge pull request #3007 from hregis/develop_origin Fix: possibility to show icon pdf, dot, doc, etc...	2015-06-12 21:37:07 +02:00
Juanjo Menent	da535b08e5	Merge pull request #3027 from marcosgdf/bug-2855 FIX Close bug #2855 Wrong translation key in localtax report page	2015-06-12 21:30:02 +02:00
Juanjo Menent	567dece678	Merge pull request #3011 from GPCsolutions/3.7-3009 FIX #3009: Better filtering to prevent SQL injection	2015-06-12 21:26:14 +02:00
Juanjo Menent	10d27ea594	Merge pull request #3012 from fmarcet/3.7 Fix: Not reading external barcode numeration module	2015-06-12 21:24:49 +02:00
Juanjo Menent	0596be1656	Merge pull request #3008 from hregis/develop_strict Fix: ereg more simple	2015-06-12 21:24:13 +02:00
Juanjo Menent	648719efdd	Merge pull request #3015 from fmarcet/develop New: Add due date filter on invoices lists	2015-06-12 21:18:31 +02:00
Juanjo Menent	9dad0add61	Merge pull request #3014 from GPCsolutions/dolibarr-2987 FIX #2987: removed dead function moneyMeter()	2015-06-12 21:07:15 +02:00
Juanjo Menent	609b1291c7	Merge pull request #3016 from GPCsolutions/dolibarr-2571 Added tag/categories management to contact card	2015-06-12 21:04:29 +02:00
Juanjo Menent	56ba4ea3d4	Merge pull request #3018 from open-minds/develop Rename "duree" property of interventions to "duration"	2015-06-12 21:03:36 +02:00
Juanjo Menent	2522cf7a0f	Merge pull request #3024 from GPCsolutions/categoriesfix Fix: missing categories class in customer/prospect card	2015-06-12 21:02:14 +02:00
Marcos García de La Fuente	f9574fa458	FIX Close #2835 Customer prices of a product shows incorrect history order	2015-06-12 19:05:08 +02:00
Marcos García de La Fuente	2051a66cd7	FIX Close #2837 Product list table column header does not match column body	2015-06-12 18:46:05 +02:00
Marcos García de La Fuente	0335892521	FIX Close bug #2861 Undefined variable $res when migrating from 3.6.2 to 3.7.0	2015-06-12 18:31:49 +02:00
Laurent Destailleur	1c280a9219	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/theme/eldy/style.css.php	2015-06-12 16:29:50 +02:00
Marcos García de La Fuente	200eb7b1bb	FIX Close bug #2855 Wrong translation key in localtax report page	2015-06-12 16:27:17 +02:00
Laurent Destailleur	f58bd37067	Css	2015-06-12 16:22:32 +02:00
Marcos García de La Fuente	300cfd2293	FIX Close bug #2891 Category hooks do not work	2015-06-12 16:10:23 +02:00
Raphaël Doursenaud	4e143755e8	Fix: missing categories class in customer/prospect card Also check that the categories module is enabled and user has permissions to see categories	2015-06-12 15:56:39 +02:00
Marcos García de La Fuente	60711d35b8	FIX Close bug #2900 Courtesy title is not stored in create thirdparty form	2015-06-12 15:53:58 +02:00
Marcos García de La Fuente	87a00d6924	FIX Close bug #2976 : "Report" tab is the current tab but it is not marked as selected by the UI	2015-06-12 15:02:05 +02:00
Laurent Destailleur	1a2bde14fb	FIX Better management error into the color conversion functions	2015-06-12 14:37:27 +02:00
Laurent Destailleur	4a726f6315	Fix css	2015-06-12 13:44:03 +02:00
Laurent Destailleur	4e5ed08ff8	Clean code	2015-06-12 13:21:21 +02:00
Laurent Destailleur	ed0e6753e3	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-06-12 13:09:32 +02:00
Laurent Léonard	a337b6f874	Rename "duree" property of interventions to "duration" This also fixes the display problem of total duration on the "soleil" document model	2015-06-11 23:18:29 +02:00
Laurent Destailleur	d2843ceabb	Add field frstrecur to be managed by withdrawal module.	2015-06-11 19:16:29 +02:00
Laurent Destailleur	3678a12767	NEW Can assign a task to yourself to have it appear on timesheet	2015-06-11 18:27:59 +02:00
Raphaël Doursenaud	6465e58032	Added tag/categories management to contact card Contact part of #2571	2015-06-11 14:50:13 +02:00
fmarcet	42b04102ba	New: Add due date filter on invoices lists	2015-06-11 12:40:16 +02:00
Raphaël Doursenaud	36486d6329	FIX #2987 : removed dead function moneyMeter()	2015-06-11 10:57:08 +02:00
Raphaël Doursenaud	3f2b543ae4	Fix #2899 : Reintroduce missing field	2015-06-11 10:53:40 +02:00
fmarcet	5783c185bd	Fix: Not reading external barcode numeration module	2015-06-11 10:43:12 +02:00
Raphaël Doursenaud	4ee6c1810e	FIX #3009 : Better filtering to prevent SQL injection	2015-06-11 10:38:29 +02:00
Raphaël Doursenaud	d89955047b	FIX #3009 : Better filtering to prevent SQL injection	2015-06-11 10:37:30 +02:00
Regis Houssin	e3d1614004	Fix: ereg more simple	2015-06-11 09:21:44 +02:00
Regis Houssin	a51a8aff59	Fix: possibility to show pdf, dot, doc, etc...	2015-06-11 09:12:24 +02:00
Regis Houssin	3fd7c26cf1	Fix: disable hook calling	2015-06-11 07:52:58 +02:00
Juanjo Menent	0de3f8ac98	Merge pull request #3000 from hregis/develop_origin Fix: Strict standards: Only variables should be passed by reference	2015-06-10 21:14:01 +02:00
Juanjo Menent	49b369035a	Merge pull request #3002 from hregis/develop_productprice NEW: add "productpricecard" hook and uniformize code	2015-06-10 21:13:01 +02:00
Juanjo Menent	4d0734950d	Merge pull request #3003 from GPCsolutions/dolibarr-3001 Fix #3001: the current code needs an array, not an object	2015-06-10 21:12:02 +02:00
Juanjo Menent	680269da26	Merge pull request #3004 from hregis/develop_strict Fix: strict mode hunter	2015-06-10 21:11:07 +02:00
Raphaël Doursenaud	95debcc376	Fix nophoto image path on company admin	2015-06-10 19:49:09 +02:00
Regis Houssin	c21156dd13	Fix: strict mode hunter	2015-06-10 18:58:42 +02:00
Raphaël Doursenaud	2629e47f77	Fix #3001 : the current code needs an array, not an object	2015-06-10 18:45:10 +02:00
Regis Houssin	e43d4a6239	NEW: add "productpricecard" hook and uniformize code	2015-06-10 18:42:16 +02:00
Regis Houssin	edd5c33c5b	Fix: Strict standards: Only variables should be passed by reference http://geoffray.be/blog/php/only-variables-should-be-passed-by-reference	2015-06-10 18:22:47 +02:00
Juanjo Menent	7f06727c56	Merge pull request #2996 from aspangaro/develop-patch28 NEW: Add a tab document in donation card	2015-06-10 17:37:17 +02:00
Regis Houssin	14780747fc	Merge remote-tracking branch 'dolibarr/3.7' into 3.7	2015-06-10 16:00:42 +02:00
Laurent Destailleur	488257d180	Fix bad coding	2015-06-08 22:16:00 +02:00
aspangaro	592d124f26	Merge remote-tracking branch 'Upstream/develop' into develop-28	2015-06-08 21:33:45 +02:00
aspangaro	1d1f19b976	NEW: Add a tab document in donation card	2015-06-08 21:28:32 +02:00
Laurent Destailleur	9b7982bf0c	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/comm/propal.php htdocs/commande/card.php htdocs/compta/facture.php htdocs/core/class/html.form.class.php htdocs/fourn/facture/card.php htdocs/theme/eldy/style.css.php	2015-06-08 18:28:50 +02:00
Laurent Destailleur	05a653ee5f	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/core/class/html.form.class.php	2015-06-08 18:21:16 +02:00
Laurent Destailleur	f9d85973aa	Merge remote-tracking branch 'origin/3.5' into 3.6	2015-06-08 18:18:37 +02:00
Laurent Destailleur	35dd069ec9	Fix #2994	2015-06-08 18:17:13 +02:00
Laurent Destailleur	b61f7dda0b	Merge pull request #2990 from GPCsolutions/dolibarr-2985 Make default avatar images public to allow Gravatar proxying	2015-06-08 17:53:37 +02:00
Laurent Destailleur	7da33519a9	Merge pull request #2989 from GPCsolutions/dolibarr-2988 Use rfc6761 example.com domain instead of domain.com in examples	2015-06-08 17:51:08 +02:00
Laurent Destailleur	3ed200766c	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-06-08 17:38:59 +02:00
Laurent Destailleur	9e1dd42b56	Fix #2986	2015-06-08 17:38:33 +02:00
Laurent Destailleur	5d4bbc457a	Fix #2987 Removed deprecated page	2015-06-08 17:30:15 +02:00
Raphaël Doursenaud	4aee11e54b	Make default avatar images public to allow Gravatar proxying Fix #2985	2015-06-08 17:23:02 +02:00
Raphaël Doursenaud	143a7d7328	Use rfc6761 example.com domain instead of domain.com in examples Fix #2988	2015-06-08 17:13:23 +02:00
Raphaël Doursenaud	08c9dd358d	FIX #2983 Load gravatar avatar images securely over HTTPS	2015-06-08 15:51:41 +02:00
Laurent Destailleur	df1dfcbd8a	NEW Can filter proposal on a tag of a product Enhance also the prototype test_arrays to include select form before table.	2015-06-08 15:07:37 +02:00
Gauthier	dd81d3a762	NEW : add all assigned users and all extrafields data in new event when we createFromClone	2015-06-08 15:06:43 +02:00
Laurent Destailleur	e9526066b7	Prepare edition of field "bydefaultinlist" for extrafields.	2015-06-08 14:12:57 +02:00
Laurent Destailleur	4a18b730b5	Fix: Avoid warning in expense report validation Fix: navigation in expense report	2015-06-08 13:49:09 +02:00
Gauthier	053cfac262	NEW : clone action on agenda events	2015-06-08 12:39:25 +02:00
Laurent Destailleur	1e0218bb9b	Merge pull request #2784 from aaujon/3.7-webservices-fix various fixes on webservices	2015-06-08 10:37:29 +02:00
Laurent Destailleur	a85f664b7a	Merge pull request #2950 from defrance69/patch-64 if duration is present on service, we use it	2015-06-08 10:35:23 +02:00
Laurent Destailleur	7f16eea13b	Merge pull request #2978 from hregis/3.7-bug Fix: use dash instead underscore and add filter for "dol_most_recent_files" for avoid conflict	2015-06-08 10:35:00 +02:00
Regis Houssin	8d824785f0	Merge remote-tracking branch 'dolibarr/3.7' into 3.7	2015-06-08 10:03:34 +02:00
Juanjo Menent	dc3ae22379	Merge pull request #2980 from hregis/3.7_crash Close #2951	2015-06-08 09:46:39 +02:00
Regis Houssin	792911b14f	Revert "Fix: Drop foreign key for avoid Mysql crash" This reverts commit `65b049fdf5`.	2015-06-08 09:28:53 +02:00
Regis Houssin	de0dd5da60	Fix: Drop foreign key for avoid Mysql crash	2015-06-08 09:14:46 +02:00
Regis Houssin	65b049fdf5	Fix: Drop foreign key for avoid Mysql crash	2015-06-08 09:13:21 +02:00
aspangaro	67c9a95ffb	FIX: Correct migration script	2015-06-08 05:28:12 +02:00
BENKE Charlie	bcf9bdc92e	Update card.php new setting vars FICHINTER_USE_SERVICE_DURATION	2015-06-07 23:18:51 +02:00
Laurent Destailleur	101a9a4cf3	Fix: object user must not be overwritten	2015-06-07 19:35:47 +02:00
Laurent Destailleur	37cadaf4bf	Fix the trigger on delete thirdparty was not called	2015-06-07 03:41:12 +02:00
Laurent Destailleur	dd08d5d660	Fix bad parameter for PUT method	2015-06-07 03:39:43 +02:00
Laurent Destailleur	536f565d4e	Fix Return value is always utf8 encoded and without entities.	2015-06-07 02:47:28 +02:00
Laurent Destailleur	c4ccf6f744	Fix: Missing the delete command	2015-06-07 00:06:11 +02:00
Laurent Destailleur	b89473383c	Fix phpcs	2015-06-06 16:41:11 +02:00
Laurent Destailleur	02dbe16366	Mutualize code to show block to link an element to another one.	2015-06-06 15:57:59 +02:00
Laurent Destailleur	1652f80300	Memory optimizing. Save 2.3 Mb of memory for all forms that can show margin informations. Save 300 Kb of memory for all other pages.	2015-06-06 15:19:25 +02:00
Laurent Destailleur	8d84dd1155	Uniformize code	2015-06-06 14:34:57 +02:00
Laurent Destailleur	89f77f5e2b	Uniformize code	2015-06-06 14:21:18 +02:00
Arnaud Aujon	3fad8ffa80	Merge remote-tracking branch 'upstream/develop' into 3.7-webservices-fix	2015-06-06 13:39:37 +02:00
Laurent Destailleur	1880ed701f	Uniformize code	2015-06-06 13:22:15 +02:00
Regis Houssin	9a812a6c28	Fix: add filter for "dol_most_recent_files" for avoid conflict with option "Save file on server with name "FA0700034-Original filename""	2015-06-06 13:03:02 +02:00
Laurent Destailleur	f42065146a	Start to clean html.form class.	2015-06-06 12:26:47 +02:00
Laurent Destailleur	fad44a068d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-06-06 11:48:28 +02:00
Laurent Destailleur	1df1a0cd2a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-06-06 00:14:28 +02:00
Laurent Destailleur	13001a5e9c	Fix #2909	2015-06-06 00:13:58 +02:00
Laurent Destailleur	6331290056	Fix phpcs	2015-06-05 20:23:04 +02:00
Laurent Destailleur	4bac36d810	Merge pull request #2972 from FHenry/develop fix bug in upgare2.php script (test $res after affect it should be better)	2015-06-05 19:06:41 +02:00
Laurent Destailleur	50fba5c506	Merge pull request #2970 from GPCsolutions/dolibarr-2969 Add missing ; to database password encryption instructions	2015-06-05 19:04:47 +02:00
Laurent Destailleur	b7cf070d2d	Fix phpcs	2015-06-05 18:43:14 +02:00
Laurent Destailleur	b57f0a0e5f	Fix option to use old path for product is for compatibility if user come from 3.6 or lower. Must not be enabled on 3.7.0 or +.	2015-06-05 18:32:49 +02:00
Laurent Destailleur	43ed48896a	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: build/debian/changelog htdocs/filefunc.inc.php htdocs/install/mysql/migration/3.6.0-3.7.0.sql	2015-06-05 18:31:53 +02:00
Laurent Destailleur	91f4fccb21	Remove warning	2015-06-05 18:26:12 +02:00
Florian HENRY	98c5a75a7e	fix bug in upgare2.php script (test $res after affect it should be better)	2015-06-05 17:51:20 +02:00
Raphaël Doursenaud	7808c5a5ad	Add missing ; to database password encryption instructions Fix #2969	2015-06-05 17:14:53 +02:00
Laurent Destailleur	1252a500ce	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/fourn/class/fournisseur.product.class.php	2015-06-05 16:50:46 +02:00
Laurent Destailleur	30f6cd08cf	Merge pull request #2943 from aspangaro/develop-donation2 New: Add object ot the company & Add picture cerfa logo	2015-06-05 15:58:47 +02:00
Laurent Destailleur	7e3a457f85	Merge pull request #2942 from aspangaro/develop-donation Fix: Donation error on admin tab & Fix: Input disabled by default	2015-06-05 15:57:35 +02:00
Laurent Destailleur	51d275ee77	Merge pull request #2941 from atm-gauthier/3.7 FIX : When we clone a propal, if it has a project which is not assign…	2015-06-05 15:56:36 +02:00
Laurent Destailleur	eebb93f435	Merge pull request #2940 from GPCsolutions/restapireview Fixed some coding style issues	2015-06-05 15:55:15 +02:00
Laurent Destailleur	689d3e39f2	Merge pull request #2939 from FHenry/develop NEW Add control another invoice supplier already exists for created from supplier order (as it is done on customer invoice)	2015-06-05 15:46:59 +02:00
Laurent Destailleur	67a9fa529f	Merge pull request #2241 from defrance69/patch-44 Update task.php	2015-06-05 15:45:50 +02:00
Laurent Destailleur	df60754e52	Merge pull request #2708 from GPCsolutions/deprecated Deprecated	2015-06-05 15:44:08 +02:00
Laurent Destailleur	3c8d54d55f	Merge pull request #2938 from FHenry/3.6 FIX : If supplier invoice block linked element is display after other block total HT amount is not reset to 0 and sum other block (like customer orders values)	2015-06-05 15:43:25 +02:00
Laurent Destailleur	b98999c9d9	Can't delete a project	2015-06-05 15:41:27 +02:00
Laurent Destailleur	ee986b1a2b	Debug merge thirdparty feature.	2015-06-05 15:15:05 +02:00
Laurent Destailleur	a33241f487	Maxi debug of 3.8. Nearly ready for freeze.	2015-06-05 14:46:30 +02:00
Laurent Destailleur	5e2d9efa07	Maxi debug of 3.8. Nearly ready for freeze.	2015-06-05 14:02:50 +02:00
Maxime Kohlhaas	f7493de50c	Fix : supplier order clone was buggy if notes contains apostrophe	2015-06-05 13:42:29 +02:00
Laurent Destailleur	4c7ccf6145	NEW Can filter on contact status in prospect list. Removed deprecated menu entry.	2015-06-05 10:49:02 +02:00
Laurent Destailleur	14b1fb845f	Remove useless tab of categories	2015-06-05 09:57:41 +02:00
Laurent Destailleur	bbd8a712cf	Merge pull request #2932 from GPCsolutions/dolibarr-2571 Added tags/categories management to customers	2015-06-05 09:44:06 +02:00
Regis Houssin	e78dba809b	Fix: PRODUCT_USE_OLD_PATH_FOR_PHOTO use entity 0 for multicompany Fix: use encrypt/decrypt with llx_const for experimental encryption of sensitive data	2015-06-05 09:42:21 +02:00
Laurent Destailleur	7c3f94d350	Merge pull request #2955 from hregis/develop_origin Fix: use encrypt/decrypt with llx_const for experimental encryption in	2015-06-05 09:35:25 +02:00
Laurent Destailleur	a605040eac	Merge pull request #2947 from aspangaro/develop-patch24 NEW Forms are using the tab look, even in creation mode	2015-06-05 09:34:52 +02:00
Laurent Destailleur	ce104116f4	Merge pull request #2931 from GPCsolutions/dolibarr-2922 Standardize categories types/ids management	2015-06-05 09:09:14 +02:00
Laurent Destailleur	a1391ba8b7	Merge pull request #2959 from aspangaro/develop-patch22 Fix: wrong file & problem to install model	2015-06-05 09:07:29 +02:00
Laurent Destailleur	5edef2f02f	NEW A module can add its entries into cron module.	2015-06-05 03:32:09 +02:00
aspangaro	fc5ea9f20f	Fix: wrong file & problem to install model	2015-06-04 21:14:30 +02:00
jfefe	195a1b2708	FIX #2957 : missing $langs object for trigger	2015-06-04 18:10:29 +02:00
Regis Houssin	5139954365	Fix: add filter in "dol_most_recent_files" for avoid conflict with option "Save file on server with name "FA0700034_Original filename""	2015-06-04 16:39:39 +02:00
Regis Houssin	e1136b4758	Fix: use encrypt/decrypt with llx_const for experimental encryption in database of sensitive data	2015-06-04 15:50:31 +02:00
Regis Houssin	6a3310daf7	Fix: PRODUCT_USE_OLD_PATH_FOR_PHOTO use entity 0 for multicompany Fix: use encrypt/decrypt with llx_const for experimental encryption of sensitive data	2015-06-04 15:42:51 +02:00
Laurent Destailleur	047390f661	Fix missing loading of language files	2015-06-04 13:58:15 +02:00
BENKE Charlie	2164729bad	if duration is present on service, we use it not logic to entered always 1h	2015-06-04 13:34:08 +02:00
Laurent Destailleur	1f92f542a6	NEW Hidden option THEME_ELDY_USE_HOVER is stable enough to become officialy visible into setup.	2015-06-04 13:32:21 +02:00
Laurent Destailleur	fa01dc200d	NEW Add hidden option MAIN_MAILFORM_DISABLE_ENTERKEY to disable the key enter into the form to send email.	2015-06-04 12:57:49 +02:00
Laurent Destailleur	331ebbdd73	Fix behaviour on grey/visible menu must be same everywhere on application.	2015-06-04 11:42:24 +02:00
Laurent Destailleur	8010cb7f33	Fix the extracss parameter was overwritten other css into textwithtooltip function. Add tooltip on THM and TJM parameter of user.	2015-06-04 10:42:12 +02:00
aspangaro	eb5dedab1a	NEW Forms are using the tab look, even in creation mode	2015-06-04 06:40:53 +02:00
Laurent Destailleur	f437bd2d6d	FIX No check warehouse is provided if module stock is not enabled.	2015-06-03 21:21:20 +02:00
Laurent Destailleur	dd8a0b849a	NEW If module salaries is on, you can set a hourly value for tome consumed by users. Each time a user enter its time consumed on a project, a calculation is done to provide the cost for human services. This value appears into the "Transversal view" of project.	2015-06-03 21:01:50 +02:00
Laurent Destailleur	995645800e	Fix loading of project	2015-06-03 18:24:09 +02:00
Laurent Destailleur	c57693a245	Fix bad param on select box for project	2015-06-03 18:08:30 +02:00
Laurent Destailleur	1411772c81	Fix sql error	2015-06-03 17:07:46 +02:00
Laurent Destailleur	d109c78c6b	Fix label of project was not visible	2015-06-03 16:59:48 +02:00
Laurent Destailleur	76865c00b5	NEW The line where mouse is over can be highlight with option THEME_ELDY_USE_HOVER (on by default)	2015-06-03 16:49:22 +02:00
Laurent Destailleur	4adeb8980d	NEW Add ref and label of project into export	2015-06-03 16:40:02 +02:00
Laurent Destailleur	f7eaf35d30	NEW When creating order, proposal or invoice from thirdparty card, the project is asked during creation. A link to create project if it does not exists is also available. NEW Uniformize form creation of proposal to add public and private notes during creation like done for order and invoice.	2015-06-03 11:55:39 +02:00
aspangaro	3461a8712a	New: Add object of the company - Needed for donation	2015-06-03 06:48:15 +02:00
aspangaro	aa9951948b	New: Add logo cerfa in common themes files	2015-06-03 06:02:52 +02:00
aspangaro	bde91633da	Fix: input of french article is disabled by default	2015-06-03 06:01:05 +02:00
aspangaro	d28a56c8ac	Correct travis	2015-06-03 05:49:43 +02:00
aspangaro	ef88a04f93	Fix: Donation error on admin tab	2015-06-02 20:41:02 +02:00
Gauthier	3f4ded4780	FIX : When we clone a propal, if it has a project which is not assigned to a third, it was not on new propal because fk_project was always set to empty string if new propal is for another third.	2015-06-02 16:06:03 +02:00
Raphaël Doursenaud	9b747a12aa	Fixed some coding style issues	2015-06-02 15:13:52 +02:00
Florian HENRY	061e675b51	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-06-02 13:02:06 +02:00
Florian HENRY	3b3319e435	Add contrl invoice supplier already exists (as it is done on customer invoice)	2015-06-02 13:01:51 +02:00
Florian HENRY	fb29fa486a	FIX : total amount in tpl linked object are not reset	2015-06-02 11:20:08 +02:00
Florian HENRY	bdaf83a653	Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6	2015-06-02 08:42:13 +02:00
Florian HENRY	3f1613197e	FIX : If supplier invoice block linked element is display after other block total HT amount is not reset to 0 and sum other block (like customer orders values)	2015-06-02 08:41:42 +02:00
Laurent Destailleur	912358f731	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-06-01 21:38:13 +02:00
Laurent Destailleur	acd693b513	Fix phpcs	2015-06-01 21:37:09 +02:00
Laurent Destailleur	6e72d3c8cc	FIX Export of tags for contact and member	2015-06-01 21:34:21 +02:00
Laurent Destailleur	6af35e5cee	Merge pull request #2822 from GPCsolutions/showbugtracklink NEW A link to the bugtracker can be enabled in the GUI	2015-06-01 20:54:12 +02:00
Arnaud Aujon	9bd32d7bf6	Merge remote-tracking branch 'upstream/develop' into 3.7-webservices-fix	2015-06-01 20:10:51 +02:00
Laurent Destailleur	4f75ab79db	Prepare 3.7.2	2015-06-01 16:32:33 +02:00
Laurent Destailleur	9ed5d817c4	Merge pull request #2936 from atm-gauthier/3.7 FIX : When we automatically create an order from a proposal with workf…	2015-06-01 16:15:37 +02:00
Laurent Destailleur	c9d63238ca	Add fields at bank account description to manage corretly sepa generation.	2015-06-01 13:19:02 +02:00
phf	0523f226cf	FIX : when mailing is deleted, the targets list was kept in database	2015-06-01 12:29:10 +02:00
Gauthier	cf4308aa3b	FIX : When we automatically creta an order from a proposal with workflow module, if some extrafields of propal don't exist in order object, insertExtraFields() function tries to insert extrafields in unexistant column of commande_extrafields table.	2015-06-01 11:24:30 +02:00
Raphaël Doursenaud	ecd5ebcb44	Member type ref is not deprecated	2015-06-01 11:10:52 +02:00
Raphaël Doursenaud	ea798c2315	Qual: deprecate dol_json_encode() and dol_json_decode() PHP > 5.3 supports json_encode() and json_decode() natively	2015-06-01 11:00:11 +02:00
Raphaël Doursenaud	3f9270ea78	Qual: added deprecation hinting Added deprecation hinting for class properties Added syslog warning events for deprecated functions, methods and/or their parameters Added hinting for some constants	2015-06-01 11:00:11 +02:00
Raphaël Doursenaud	a24e4fec6c	NEW A link to the bugtracker can be enabled in the GUI	2015-06-01 10:46:56 +02:00
Laurent Destailleur	e9687cbc4f	Fix the amount for entry price must use the format dedicated to amount.	2015-05-31 18:23:11 +02:00
Laurent Destailleur	523b04a315	Work on finishing	2015-05-31 17:31:15 +02:00
Laurent Destailleur	3588d73c8e	Fix css	2015-05-31 16:36:11 +02:00
Laurent Destailleur	1b681510a5	NEW Use new select2 component for juridical status, country and state selection.	2015-05-31 12:25:33 +02:00
Laurent Destailleur	19694710b2	Keep this constant visible	2015-05-31 12:24:23 +02:00
Laurent Destailleur	01aad8516d	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/adherents/list.php htdocs/compta/dons/card.php htdocs/compta/dons/class/don.class.php htdocs/contact/list.php htdocs/contrat/list.php htdocs/core/class/html.form.class.php htdocs/core/lib/security.lib.php htdocs/main.inc.php htdocs/product/stock/massstockmove.php htdocs/public/test/test_arrays.php htdocs/public/test/test_forms.php htdocs/societe/societe.php	2015-05-31 03:30:38 +02:00
Laurent Destailleur	36de50f60d	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-05-31 03:07:36 +02:00
Laurent Destailleur	3cfe4dc86e	Sync language files	2015-05-31 03:07:17 +02:00
Laurent Destailleur	7c4c096310	Fix typo	2015-05-31 02:33:03 +02:00
Laurent Destailleur	ceb2622181	Merge pull request #2934 from aspangaro/develop-patch24 NEW: Add a button to purge criteria in user list	2015-05-31 02:18:43 +02:00
Laurent Destailleur	487879ffd7	Merge pull request #2933 from bafbes/develop fix 600 first lines of arabic language admin file	2015-05-31 02:15:52 +02:00
Laurent Destailleur	3690274375	Merge pull request #2930 from atm-ph/fix_issue_2901 Fix issue 2901	2015-05-31 02:09:40 +02:00
Laurent Destailleur	49f2157f2d	Little debug of module resource	2015-05-31 02:05:39 +02:00
Laurent Destailleur	5e773d4cb6	Work on finishing of style	2015-05-31 01:06:51 +02:00
Laurent Destailleur	7a0ec2d831	Prototype with datatables works now also ith jmobile. Add field fifo and lifo into product table.	2015-05-30 23:56:42 +02:00
aspangaro	fa2413f45a	NEW: Add a button to purge criteria in user list	2015-05-30 21:01:37 +02:00
Laurent Destailleur	9b4ab63c7d	Fix style	2015-05-30 20:07:44 +02:00
Laurent Destailleur	36b7f1dcf3	NEW Show photo of logged user into login top right block. NEW If no photo is available for user, we show a generic photo depending on gender	2015-05-30 19:50:07 +02:00
Laurent Destailleur	0b372a4017	Use a dedicated icon instead of generic one	2015-05-30 17:32:50 +02:00
Laurent Destailleur	bfe85cbf37	Better error management	2015-05-30 16:14:54 +02:00
Laurent Destailleur	7f352e5b24	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-05-30 15:21:56 +02:00
Laurent Destailleur	b14b1c1b12	Use dedicated picto	2015-05-30 15:21:48 +02:00
Laurent Destailleur	d9e8b6d977	Merge pull request #2921 from atm-gauthier/3.7 FIX : when we create an agenda event with "Not applicable" status, it…	2015-05-30 15:10:53 +02:00
Laurent Destailleur	03c06b3cf8	Merge pull request #2916 from aspangaro/develop-patch23 FIX: export salaries & NEW: Add tab document on salaries payment	2015-05-30 15:09:23 +02:00
Laurent Destailleur	5e486d798e	Merge pull request #2915 from aspangaro/develop-ER ER add key language	2015-05-30 15:09:00 +02:00
Laurent Destailleur	133893336b	Merge pull request #2914 from aspangaro/develop-patch22 Fix: Wrong language key	2015-05-30 15:07:17 +02:00
Laurent Destailleur	a60ab7dd29	Merge pull request #2912 from atm-ph/fix_36_reassort_target FIX top links menu have target attribute with wrong value	2015-05-30 15:06:46 +02:00
Laurent Destailleur	f5ec2c0605	Merge pull request #2911 from aspangaro/develop-md NEW Forms are using the tab look, even in creation mode	2015-05-30 15:01:26 +02:00
Laurent Destailleur	07ae39fc38	Merge pull request #2910 from aspangaro/develop-patch21 Fix: wrong link	2015-05-30 15:00:30 +02:00
Laurent Destailleur	920dc80dd6	Merge pull request #2908 from defrance69/patch-63 NEW Add hook for more action buttons on product supplier page	2015-05-30 14:59:58 +02:00
Laurent Destailleur	13b78f9c17	NEW Add gender property managed on user card FIX Better error messages when uploading photo of user when permission to write are not granted	2015-05-30 02:17:05 +02:00
Laurent Destailleur	6701b399ae	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-05-30 00:26:47 +02:00
abb	1048bd1ba4	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop	2015-05-29 22:11:00 +01:00
abb	3c8d37cb05	fix 600 first lines of arabic language admin file	2015-05-29 22:03:06 +01:00
Raphaël Doursenaud	bbd0b89087	Added tags/categories management to customers Customers part of #2571	2015-05-29 18:50:43 +02:00
Raphaël Doursenaud	074fcd9769	Standardize categories types/ids management Fix #2922 Fix #2843	2015-05-29 17:51:34 +02:00
Laurent Destailleur	2fb44caedb	Merge pull request #2906 from atm-ph/fix_37_fetch_contact FIX : Compare array_options with oldcopy	2015-05-29 17:41:38 +02:00
phf	9f52b9e800	FIX : #2901	2015-05-29 17:27:05 +02:00
Laurent Destailleur	888bec2df3	Merge pull request #2904 from fappels/develop FIX #2859 HTML units selector	2015-05-29 17:21:32 +02:00
Laurent Destailleur	abcd7ae667	Merge pull request #2903 from atm-ph/fix_37_thirdparty_extrafield FIX : extrafields required on thirdparty	2015-05-29 17:19:20 +02:00
Laurent Destailleur	0ab3cd03c0	Merge pull request #2896 from GPCsolutions/extrafieldcontacttype Allow usage of contact extrafield element type	2015-05-29 17:18:25 +02:00
Laurent Destailleur	58dbfd38a9	Merge pull request #2926 from hregis/develop_origin Fix: possibility to shared facnumber between entities	2015-05-29 17:16:02 +02:00
Laurent Destailleur	11552e90b7	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-05-29 17:15:27 +02:00
phf	81b6655940	Merge branch '3.7' of https://github.com/Dolibarr/dolibarr into 3.7	2015-05-29 17:13:03 +02:00
Laurent Destailleur	65c7ab7a93	Fix: Introduce error by default when function is used as a true delete function.	2015-05-29 17:11:42 +02:00
Laurent Destailleur	d925ecb4f1	Revert "Made test pessimistic by default"	2015-05-29 17:09:35 +02:00
Laurent Destailleur	eb62c7e462	Merge pull request #1446 from GPCsolutions/removefiles Made test pessimistic by default	2015-05-29 16:56:28 +02:00
Regis Houssin	53fbab52f3	Merge remote-tracking branch 'dolibarr/develop' into develop_origin	2015-05-29 16:32:53 +02:00
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 Garcí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 Garcí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 Garcí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 García de La Fuente	9ebae9520a	Extrafields does not form part of this class	2015-05-20 16:46:12 +02:00
Marcos Garcí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 Garcí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 Garcí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 García de La Fuente	190f12c4c4	Merge branch '3.5' into bug-2757 Conflicts: ChangeLog	2015-05-12 10:16:48 +02:00
Marcos Garcí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 García de La Fuente	fb01f89e95	Unwanted deletion	2015-05-10 12:44:36 +02:00
Marcos García de La Fuente	9988b1ad4e	Revert `25812f0`	2015-05-10 12:43:21 +02:00
Marcos Garcí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 García de La Fuente	f6616deef3	Removed debugging function	2015-05-10 01:28:40 +02:00
Marcos Garcí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 Garcí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 García de La Fuente	28b89a2dec	Fix [ bug #1786 ] Spanish localtax2 calculation errors with corrective invoices	2015-04-19 18:58:56 +02:00
Marcos García de La Fuente	2967bc7df7	Merge branch 'develop' into units	2015-04-19 17:19:59 +02:00
Marcos Garcí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 Garcí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 Garcí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 Garcí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 Garcí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 Garcí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 Garcí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 Garcí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 Garcí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 Garcí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 Garcí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 Garcí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 Garcí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 Garcí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

... 20 21 22 23 24 ...

42607 Commits