dolibarr

Author	SHA1	Message	Date
Laurent Destailleur	972d95a3c6	Better translation for nature of contact	2016-02-29 13:21:09 +01:00
Laurent Destailleur	be9a144433	FIX Add a test to show bugged module with a bad declaration of dictionaries to avoid to see clean module to be breaked.	2016-02-28 12:43:00 +01:00
Laurent Destailleur	2ee74a80d9	NEW Enhance navigation of project module	2016-02-28 00:01:50 +01:00
aspangaro	1bf188db86	Fix: Double line	2016-02-27 14:34:32 +01:00
Laurent Destailleur	8807222f24	Fix a lot of fixes to have the french vat npr working better	2016-02-27 12:22:39 +01:00
Laurent Destailleur	c86a1a30d5	Fix a lot of fixes to have the french vat npr working better	2016-02-27 11:46:16 +01:00
Laurent Destailleur	23f45c7b7e	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/commande/list.php htdocs/core/lib/pdf.lib.php	2016-02-26 15:45:25 +01:00
Laurent Destailleur	4250fe155a	Fix showing ref of shipment on orders (lines too long)	2016-02-26 15:42:07 +01:00
Laurent Destailleur	1fa94e4d6a	NEW Introduce position of records into dictionnary of type of contacts	2016-02-26 15:03:07 +01:00
Laurent Destailleur	a5554cc79e	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-02-26 13:44:15 +01:00
Laurent Destailleur	c1ea597cb7	Redesign page with customer price to make it easier to understand.	2016-02-26 13:44:03 +01:00
Laurent Destailleur	2e25c7969b	Fix when setting a price for a product, selection of product must not show any price	2016-02-26 12:22:32 +01:00
Laurent Destailleur	e115ac90ec	Code comment	2016-02-26 12:08:04 +01:00
Laurent Destailleur	16a716ebbc	Merge pull request #4655 from defrance/patch-103 ODT generation : No segment defined in odt file is not an error	2016-02-26 11:15:34 +01:00
Laurent Destailleur	f330a1c8e5	Fix phpcs	2016-02-26 10:55:47 +01:00
Laurent Destailleur	b072b5a181	Fix remove some warnings Conflicts: htdocs/core/lib/pdf.lib.php	2016-02-26 10:45:25 +01:00
Laurent Destailleur	61edda61e1	Fix remove some warnings	2016-02-26 10:38:42 +01:00
Laurent Destailleur	4b4de22a54	NEW Add hook pdf_build_address NEW Add option MAIN_PUBLIC_NOTE_IN_ADDRESS	2016-02-25 20:54:37 +01:00
Laurent Destailleur	54034ea852	NEW Add $object in parameter of pdf_build_address so we could include hook into the function.	2016-02-25 18:30:31 +01:00
Laurent Destailleur	cdcad62967	FIX Array of linked elements for PDF contains duplicates and missing data	2016-02-25 18:19:20 +01:00
Laurent Destailleur	7fc58ddabc	FIX Array of linked elements for PDF contains duplicates and missing data	2016-02-25 18:18:00 +01:00
Laurent Destailleur	8c43276fda	FIX Extrafields of shipments was not included into export fields	2016-02-25 15:46:14 +01:00
Laurent Destailleur	b3c3d3aac5	NEW Add total weight and volume on PDF NEW Can hide column qty ordered.	2016-02-25 14:18:32 +01:00
Laurent Destailleur	a95240e33d	FIX Some troubles into weight and volume calculation when unit differs. NEW Introduce a function showDimensionInBestUnit	2016-02-25 13:46:38 +01:00
Laurent Destailleur	a5c3658f53	Fix bad formatting of order / shipment ref on PDF	2016-02-25 02:45:27 +01:00
Laurent Destailleur	f1ba81ec66	Fix bad formatting of order / shipment ref on PDF	2016-02-25 02:44:34 +01:00
Laurent Destailleur	b0f816a400	NEW Add weight/volume for one product into shipment export	2016-02-25 02:22:40 +01:00
Laurent Destailleur	1ba2407da4	Merge remote-tracking branch 'origin/3.9' into develop	2016-02-25 01:42:03 +01:00
Laurent Destailleur	02c0f52880	NEW Include sales representative into export of thirdparties	2016-02-24 16:56:24 +01:00
Laurent Destailleur	33d5fa38ef	Fix pdfBuildThirdpartyName must return main name. Alias should be an option.	2016-02-24 13:30:16 +01:00
Laurent Destailleur	371dec8503	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql htdocs/langs/en_US/products.lang htdocs/langs/fr_FR/companies.lang	2016-02-24 12:13:12 +01:00
Laurent Destailleur	2747259fbd	Fix: missing payment term and condition into update method	2016-02-24 12:01:50 +01:00
Laurent Destailleur	28b8258acb	Fix in most cases, we don't need translated value of languages, jsut list of language code. Fix cost price was not updated.	2016-02-23 19:50:33 +01:00
Laurent Destailleur	ac6001cec8	Fix do not show warning if account defined	2016-02-23 12:44:46 +01:00
Ion Agorria	673f0c70a6	NEW: TimeZone can be supplied to mktime	2016-02-22 22:00:59 +01:00
Laurent Destailleur	843dada35d	Fix translation export/import	2016-02-22 17:42:41 +01:00
Laurent Destailleur	ff9a82c96f	Merge pull request #4670 from atm-ph/new_add_multicurrency_supplier_invoice_payment New add multicurrency supplier invoice payment	2016-02-22 16:26:31 +01:00
Laurent Destailleur	ef497e2129	Merge pull request #4669 from peckpeck/translation_import Add support to product translation imports	2016-02-22 16:17:19 +01:00
Laurent Destailleur	77cbd885f2	NEW Add minimum stock and desired stock into import/export profiles. NEW Add state into thirdparty export fields	2016-02-22 15:30:27 +01:00
Laurent Destailleur	cfdaa0e13c	Fix missing translation Fix import of state	2016-02-22 14:49:30 +01:00
Laurent Destailleur	8e83f4f15c	Fix missing translation load	2016-02-22 13:52:01 +01:00
Laurent Destailleur	f6d1913bb7	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/fourn/class/fournisseur.commande.class.php	2016-02-22 13:35:46 +01:00
Laurent Destailleur	762ab060e4	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9	2016-02-22 13:28:18 +01:00
Laurent Destailleur	355f091246	FIX Option MAIN_FORCE_STATE_INTO_ADDRESS and SOCIETE_DISABLE_STATE	2016-02-22 13:28:08 +01:00
Laurent Destailleur	945eb9f094	NEW Add the event BILL_PAYED to list of supported events for module notification.	2016-02-22 12:52:01 +01:00
Laurent Destailleur	e7e6957073	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9	2016-02-22 09:27:53 +01:00
Laurent Destailleur	a4f189eea7	Fix do not show warning if account defined	2016-02-22 09:27:18 +01:00
Benoît Peccatte	c969b09ef7	Add support to product translation imports	2016-02-21 22:04:47 +01:00
Laurent Destailleur	0dc76fa1cd	Merge pull request #4626 from IonAgorria/hide-hourmins-2 Form changes to add duration info	2016-02-21 19:22:13 +01:00
Laurent Destailleur	fb0e74645e	Merge pull request #4663 from peckpeck/xlsx_support NEW Allow imports from xlsx files	2016-02-21 19:12:38 +01:00
Benoît Peccatte	5a8d1f1c95	Allow imports from xlsx files	2016-02-21 14:10:19 +01:00
Laurent Destailleur	d3960b0809	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/core/lib/member.lib.php htdocs/expedition/card.php	2016-02-20 04:25:39 +01:00
Laurent Destailleur	277d92af75	Secure migration for people using a RC	2016-02-20 03:14:29 +01:00
Laurent Destailleur	7ff8c2c3db	FIX Missing carriage return when phone is into property ->phone	2016-02-20 02:31:42 +01:00
Laurent Destailleur	266fb14a2c	FIX Missing carriage return when phone is into property ->phone	2016-02-20 02:19:18 +01:00
phf	b7d99271f8	New add multicurrency on supplier order	2016-02-19 22:25:59 +01:00
Laurent Destailleur	7765e37101	Better support of option SOCIETE_SORT_ON_TYPEENT	2016-02-19 21:09:36 +01:00
Laurent Destailleur	82f57b2ccf	Better position for modules	2016-02-19 20:05:25 +01:00
Laurent Destailleur	da284cda8c	Add category Supplier Relationship Manager	2016-02-19 19:20:21 +01:00
Laurent Destailleur	00657d3bbe	Fix sql forging error	2016-02-19 19:11:54 +01:00
BENKE Charlie	8349446340	No segment defined is not an error This is a proposition of correction on all ODT file If we don't define table of segment on odt we have an error But in some case we don't want an table on ODT	2016-02-19 10:59:50 +01:00
aspangaro	d77a8bddcf	Fixed: Members - Problem of tab & missing language file	2016-02-19 07:39:14 +01:00
Laurent Destailleur	9c8d69eaa9	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/core/menus/init_menu_auguria.sql htdocs/core/menus/standard/eldy.lib.php	2016-02-19 04:46:11 +01:00
Laurent Destailleur	761ad0114c	Merge pull request #4641 from atm-ph/new_add_multicurrency_supplier_proposal_order New add multicurrency on supplier proposal/order	2016-02-19 03:36:23 +01:00
Laurent Destailleur	3b5ce32cb0	Code comment	2016-02-19 01:47:00 +01:00
Laurent Destailleur	bd80249580	Fix code comment	2016-02-19 01:45:52 +01:00
Laurent Destailleur	52c82508e4	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/compta/charges/index.php	2016-02-18 23:27:57 +01:00
Laurent Destailleur	b0b2668428	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9	2016-02-18 23:21:22 +01:00
Laurent Destailleur	bc4c964b89	Several fixes in stock management (label, and bad action when lot module is on)	2016-02-18 23:21:02 +01:00
Laurent Destailleur	5d2c189e0e	Fix bad place of table	2016-02-17 23:45:25 +01:00
Laurent Destailleur	633de3bcb4	Fix list of object referers should not be set to invoice by default (may be module is disabed). I replace with a message to choose list.	2016-02-17 22:33:02 +01:00
phf	e24a35b904	New add multicurrency on supplier proposal/order	2016-02-16 23:58:21 +01:00
Laurent Destailleur	5268038e00	Minor css enhancement	2016-02-16 22:58:24 +01:00
Laurent Destailleur	14fb2c914a	Fix option MAIN_USE_HOURMIN_IN_DATE_RANGE was not supported in output	2016-02-16 15:41:55 +01:00
Laurent Destailleur	5fb8068374	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-02-16 15:39:21 +01:00
Laurent Destailleur	060b59ac6c	Fix option MAIN_USE_HOURMIN_IN_DATE_RANGE was not supported in output	2016-02-16 15:38:24 +01:00
Laurent Destailleur	e0a0817123	Merge pull request #4623 from IonAgorria/dynamic-price-changes Dynamic price corretions/changes	2016-02-16 15:11:02 +01:00
Laurent Destailleur	9d418bca7f	Merge branch 'new_add_customer_multicurrency_payment' of https://github.com/atm-ph/dolibarr into atm-ph-new_add_customer_multicurrency_payment Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-02-16 15:06:39 +01:00
Laurent Destailleur	d8e173af03	Fix regression (class not found, css on hover broken) with try to manage contrast on categories.	2016-02-16 15:01:28 +01:00
Laurent Destailleur	36b0cb5b23	NEW Merge all admin tools (system and module admin tools) into same entry "Admin tools", so now things are clear: All features restricted to an admin user is inside "setup" (for setup) or "admin tools" (for action tools) instead of 3 different entries.	2016-02-16 12:50:15 +01:00
Regis Houssin	d55ac472c3	Fix: issue when bank module is disabled Fix: missing entity filter for lines of payment	2016-02-16 11:27:58 +01:00
Laurent Destailleur	c78997ed23	Tons of fixes and enhancement on recurring invoice generation	2016-02-16 00:31:05 +01:00
phf	86c8998742	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_add_customer_multicurrency_payment Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-02-15 20:53:06 +01:00
Laurent Destailleur	d715345c82	Debug	2016-02-15 15:07:57 +01:00
aspangaro	a8ead1d44c	Merge remote-tracking branch 'Upstream/3.9' into 3.9-p11 Correct conflicts: htdocs/core/menus/standard/eldy.lib.php	2016-02-15 06:31:34 +01:00
Laurent Destailleur	7aaae143fc	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/core/menus/standard/eldy.lib.php htdocs/expedition/card.php	2016-02-15 02:01:58 +01:00
Laurent Destailleur	3bcc7b0f8f	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/comm/remise.php htdocs/expedition/card.php htdocs/expedition/class/expedition.class.php htdocs/filefunc.inc.php htdocs/societe/price.php	2016-02-15 01:37:23 +01:00
Laurent Destailleur	1cf2b1b3af	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9	2016-02-15 01:19:57 +01:00
Laurent Destailleur	fdea892e3b	Merge pull request #4220 from bafbes/patch-11 NEW Can change customer on orders when hidden option COMMANDE_CHANGE_THIRDPARTY is on	2016-02-15 01:14:08 +01:00
Laurent Destailleur	4d4a35c93f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-02-15 00:46:20 +01:00
Laurent Destailleur	e8bc88fffe	Merge branch 'new_recurring_invoice' of https://github.com/atm-ph/dolibarr into atm-ph-new_recurring_invoice Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-02-15 00:45:39 +01:00
Laurent Destailleur	1e0d1d0ca1	Merge pull request #4592 from FHenry/develop Accountancy feature	2016-02-15 00:38:15 +01:00
Laurent Destailleur	0c4d44a86c	Merge pull request #4591 from FHenry/3.9 Accoutancy	2016-02-15 00:35:24 +01:00
Laurent Destailleur	0d5f30f627	Merge pull request #4589 from frederic34/patch-8 Update google_oauthcallback.php	2016-02-15 00:34:22 +01:00
Laurent Destailleur	1cb6c7f3e9	Merge pull request #4603 from GPCsolutions/3.9-4597 FIX #4597 PHP 7 Uniform Variable Syntax	2016-02-15 00:32:11 +01:00
Laurent Destailleur	71a12824c9	Merge branch 'new_numbering_module_supplier_payment' of https://github.com/atm-ph/dolibarr into atm-ph-new_numbering_module_supplier_payment Conflicts: htdocs/accountancy/admin/productaccount.php htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-02-15 00:31:33 +01:00
abb	7ecb263a04	Merge branch 'develop' of https://github.com/bafbes/dolibarr into dev	2016-02-15 00:20:19 +01:00
Laurent Destailleur	a9aab7545e	Merge pull request #4575 from altatof/fix_ttc_display FIX: add missing global def for ttc column	2016-02-15 00:14:34 +01:00
Laurent Destailleur	51ededc794	Fix duplicate template crabe and crevette. crevette was not updated and contains old code compared to crabe. To manage situation invoice with a PDF, code must be included into crabe (with some test if invoice is a situation invoice or not to manage if to have different code)	2016-02-15 00:02:07 +01:00
Laurent Destailleur	3925ae0742	Fix: we loose ability to refresh contact list when changing a company on contact tab	2016-02-14 23:54:07 +01:00
Ion Agorria	a72c49f57b	Form changes to add duration info	2016-02-14 22:33:44 +01:00
Laurent Destailleur	4bb980830f	Merge pull request #4571 from defrance/patch-99 Add Good Customers Boxes	2016-02-14 20:56:22 +01:00
abb	834f0b20ae	fix:no transaction in this place	2016-02-14 20:55:09 +01:00
abb	2f99273734	fix:no transaction in this place	2016-02-14 20:51:36 +01:00
Laurent Destailleur	666a3d907d	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9	2016-02-14 20:48:39 +01:00
Laurent Destailleur	b7ae5bac6f	Fix: The text "All" is not appropriate.	2016-02-14 20:48:25 +01:00
Ion Agorria	89657d0439	Changed Price Parser functions and added testExpression	2016-02-14 17:28:31 +01:00
Ion Agorria	99efbd3464	Check if dynamic price is enabled	2016-02-14 16:09:47 +01:00
Laurent Destailleur	d6227fd981	Merge pull request #4611 from bafbes/abb-0 urgent fix : start of transaction without finish	2016-02-14 12:51:30 +01:00
Laurent Destailleur	d973596601	Merge pull request #4587 from frederic34/patch-7 Update modOauth.class.php	2016-02-14 12:21:03 +01:00
aspangaro	47f60e1f8d	Add function img_weather	2016-02-13 07:53:50 +01:00
Laurent Destailleur	cd3a531449	Debug multicurrency	2016-02-13 03:33:41 +01:00
Laurent Destailleur	ecc338b1eb	Clean module	2016-02-13 03:25:20 +01:00
abb	4dce09cd27	include expense reports in linked objects section and provide template for them in this section Conflicts: htdocs/core/class/html.form.class.php	2016-02-13 00:37:38 +01:00
abb	0063635c67	fix:no transaction in this place	2016-02-13 00:00:20 +01:00
Laurent Destailleur	969314e731	Fix: disabling option lead in not working dolibarr	2016-02-12 12:19:32 +01:00
Laurent Destailleur	bc33b19d7d	NEW Can change dynamically number of records visible into lists.	2016-02-11 20:24:15 +01:00
Raphaël Doursenaud	d038ca1875	FIX #4597 PHP 7 Uniform Variable Syntax PHP7 compatibility with the new Uniform Variable Syntax. This change is compatible with both PHP 5 and PHP 7. See: https://wiki.php.net/rfc/uniform_variable_syntax#backward_incompatible_changes	2016-02-11 20:01:51 +01:00
Laurent Destailleur	e67be201ed	NEW Can select number of lines on page list for projects and tasks	2016-02-11 16:49:13 +01:00
Laurent Destailleur	51cc252d4a	Fix: submit was no more possible from keyboard	2016-02-11 15:47:47 +01:00
phf	875e01aeee	New add recurrence fields on create form of invoice model Fix missing fields in database about multicurrency	2016-02-11 09:50:35 +01:00
aspangaro	b47252fcb6	Modifiy menu for accountancy module - New balance feature	2016-02-11 06:39:02 +01:00
Laurent Destailleur	0d7f67ade5	Merge remote-tracking branch 'origin/3.9' into develop	2016-02-10 23:59:15 +01:00
Laurent Destailleur	e169cd3364	Fix usage of filter into selection of email members into emailing.	2016-02-10 23:48:18 +01:00
Laurent Destailleur	6662c1b5e1	NEW Can select dynamicaly number of lines to show on page on product, shipment, contact, orders, thirdparties Fix can make a shipment for product not predefined in multiwarehouse mode	2016-02-10 23:37:34 +01:00
phf	a0cfe9aad8	New add payment with multicurrency module	2016-02-10 23:16:38 +01:00
Laurent Destailleur	9b41e11a1e	NEW Can select dynamicaly number of lines to show on page	2016-02-10 20:48:18 +01:00
Laurent Destailleur	ab2ac26f17	NEW When a field to show into list is selected, the form is automatically submited	2016-02-10 19:27:22 +01:00
Laurent Destailleur	6dbaba6973	Fix: previous and next arrow	2016-02-10 17:45:26 +01:00
philippe grand	d02f8393dc	Merge branch '3.8' of https://github.com/Dolibarr/dolibarr.git into 3.8	2016-02-10 11:43:33 +01:00
Florian HENRY	ef7e245432	g	2016-02-09 19:23:17 +01:00
Florian HENRY	4401995540	Accountancy feature	2016-02-09 19:22:52 +01:00
Florian HENRY	44e39519b0	add accountancy balance	2016-02-09 19:20:03 +01:00
Laurent Destailleur	7ef0415aca	Small per enhancement	2016-02-09 15:57:24 +01:00
Laurent Destailleur	5c1c413c02	Fix warning	2016-02-09 15:44:34 +01:00
Laurent Destailleur	5ea9c6dd83	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/accountancy/admin/productaccount.php htdocs/core/class/html.formprojet.class.php htdocs/core/menus/standard/eldy.lib.php htdocs/filefunc.inc.php htdocs/langs/en_US/accountancy.lang	2016-02-09 14:40:25 +01:00
Frédéric FRANCE	c28f977e02	Update printgcp.modules.php	2016-02-09 14:12:34 +01:00
Frédéric FRANCE	51da5ea1f0	Update printgcp.modules.php	2016-02-09 14:07:54 +01:00
Frédéric FRANCE	73041b0be5	Update google_oauthcallback.php	2016-02-09 14:05:05 +01:00
Laurent Destailleur	f640bf7c61	Manage the reply-to field into mail libs	2016-02-09 11:56:12 +01:00
Laurent Destailleur	805940f61c	Merge pull request #4539 from bafbes/patch-22 Set mail reply-to field to sender in smtps class	2016-02-09 10:17:33 +01:00
Laurent Destailleur	d89daf9cd2	Work to move the merge pdf tool into the mass action combo of lists	2016-02-08 18:04:42 +01:00
Frédéric FRANCE	5dd016c3bc	Update modOauth.class.php	2016-02-08 17:55:29 +01:00
Laurent Destailleur	7445a0f71c	Clean code for generating sheet of barcode. Can choose output filename.	2016-02-08 16:42:34 +01:00
Laurent Destailleur	404663472a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-02-08 15:50:34 +01:00
Laurent Destailleur	0b6bd0bc14	More robust error management on barcode module.	2016-02-08 15:49:38 +01:00
BENKE Charlie	c672ad9fed	Update box_goodcustomers.php	2016-02-08 15:00:49 +01:00
Laurent Destailleur	fcf1e20d5b	Merge pull request #4578 from frederic34/sticker Dictionnary for label sticker and card format	2016-02-08 14:49:31 +01:00
Laurent Destailleur	d2708a4225	Merge pull request #4475 from atm-ph/new_multicurrency_module New multicurrency module	2016-02-08 14:44:49 +01:00
philippe grand	a15d03a676	fix : Strict Standards: Only variables should be passed by reference	2016-02-08 10:06:32 +01:00
Laurent Destailleur	cfa3b16637	Menu entries for accountancy are shown when menu entry is selected and not all the time	2016-02-07 22:47:46 +01:00
Laurent Destailleur	ad63d5c48d	NEW Move load module to status experimental	2016-02-07 22:47:16 +01:00
Laurent Destailleur	81aae30253	NEW Add a checkbox to select/unselect all lines on page that support mass actions (like invoice list page)	2016-02-07 19:55:41 +01:00
Laurent Destailleur	786f16de02	Add comment	2016-02-07 16:20:07 +01:00
Laurent Destailleur	baa6172ead	Fix look for first incoterm combo	2016-02-07 16:13:33 +01:00
Laurent Destailleur	9da0164d90	Uniformize code for lists	2016-02-07 15:50:48 +01:00
Laurent Destailleur	28c89dc3e3	Prepare the ground to have a full editable homearea page	2016-02-07 13:10:36 +01:00
aspangaro	9d427d2248	Fixed: Missing link in eldy menu to init accountancy	2016-02-07 07:41:53 +01:00
Laurent Destailleur	84f4f2d40f	FIX The search on user/group was not using new code. Fiels used for search was not visible.	2016-02-07 02:55:56 +01:00
Laurent Destailleur	8a8aaf618d	Fix: select to add box was lost	2016-02-07 02:22:10 +01:00
Laurent Destailleur	806d3642d8	FIX Bad filter on opportunities Conflicts: htdocs/core/class/html.formprojet.class.php	2016-02-06 15:09:57 +01:00
Laurent Destailleur	3828fe7026	FIX Bad filter on opportunities	2016-02-06 15:06:37 +01:00
phf	d66bc6f1b3	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_numbering_module_supplier_payment Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2016-02-06 12:57:30 +01:00
Laurent Destailleur	2e1011ca0c	Add hidden option MAIN_CAN_HIDE_EXTRAFIELDS to disable a feature that seems useless.	2016-02-06 12:29:02 +01:00
frederic34	0d11d94234	Merge remote branch 'upstream/develop' into sticker Conflicts: htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-02-06 12:12:35 +01:00
frederic34	9c74af63af	Dictionnary for label sticker and card format	2016-02-06 12:06:05 +01:00
BENKE Charlie	e2afe5460e	Update modSociete.class.php	2016-02-05 23:37:31 +01:00
BENKE Charlie	eb48e84b34	name of boxe file changed	2016-02-05 23:37:04 +01:00
Laurent Destailleur	fd7a05490d	DiscountOffered text was too long	2016-02-05 20:06:07 +01:00
Christophe Battarel	7a6c7f10a6	FIX: add missing global def for ttc column	2016-02-05 19:14:40 +01:00
Laurent Destailleur	7044e62afa	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2016-02-05 18:37:13 +01:00
Laurent Destailleur	bf7181a064	All messages separated with , into errorsToString	2016-02-05 18:37:01 +01:00
Laurent Destailleur	02c54f4ea6	Merge pull request #4573 from altatof/fix_ttc FIX: retrieve correct pu_ttc (set by printObjectLine function) like in 3.7	2016-02-05 18:34:45 +01:00
Laurent Destailleur	cb66448148	Merge pull request #4564 from atm-ph/new_feature_hidden_extrafields NEW feature hidden extrafields	2016-02-05 17:22:51 +01:00
Christophe Battarel	f0aef88589	better fix	2016-02-05 13:49:19 +01:00
Christophe Battarel	36c7697b63	FIX: retrieve correct pu_ttc (set by printObjectLine function) like in 3.7	2016-02-05 13:43:06 +01:00
Laurent Destailleur	e1da95871a	Fix bad name	2016-02-05 12:23:16 +01:00
Laurent Destailleur	062deae24c	Merge	2016-02-05 12:18:50 +01:00
Laurent Destailleur	d66d3c0a8f	Merge pull request #4567 from defrance/patch-98 Add odt & pdf edition on product	2016-02-05 10:57:49 +01:00
Laurent Destailleur	8e7b560cea	Merge pull request #4562 from atm-ph/fix_formpropal_infinite_loop FIX infinite loop	2016-02-05 10:51:49 +01:00
Laurent Destailleur	5a2647906e	Merge pull request #4530 from defrance/patch-96 Add hook on contacttpl	2016-02-05 10:50:40 +01:00
phf	a8e480e392	FIX #3509 payment ref for suppliers	2016-02-04 23:15:06 +01:00
phf	32c0b2a9b1	NEW add html id/class to locate value in the DOM html	2016-02-04 21:05:19 +01:00
phf	7e3a787688	FIX phpcs	2016-02-04 19:03:25 +01:00
BENKE Charlie	5498b1cd5a	Update modSociete.class.php	2016-02-04 18:06:43 +01:00
BENKE Charlie	70e051a1bf	Add goods customers boxes	2016-02-04 18:05:35 +01:00
Frédéric FRANCE	a656607122	Update CMailFile.class.php	2016-02-04 17:12:58 +01:00
BENKE Charlie	87c5854382	just change for rerun travis cheking	2016-02-04 16:58:19 +01:00
BENKE Charlie	f87bfffdd9	add edition feacture on product element	2016-02-04 16:12:00 +01:00
phf	0c05342934	FIX infinite loop	2016-02-03 22:54:48 +01:00
phf	75c4888364	NEW feature hidden extrafields	2016-02-03 22:49:43 +01:00
phf	1b552a0b3b	Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module Conflicts: htdocs/core/class/link.class.php htdocs/install/mysql/migration/3.9.0-4.0.0.sql	2016-02-03 18:30:59 +01:00
Laurent Destailleur	47e2e33fb7	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/accountancy/admin/index.php htdocs/accountancy/admin/productaccount.php htdocs/accountancy/class/html.formventilation.class.php htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/purchasesjournal.php htdocs/accountancy/journal/sellsjournal.php htdocs/core/menus/init_menu_auguria.sql	2016-02-03 03:27:17 +01:00
Laurent Destailleur	19300a2d82	Fix warning when javascript disabled	2016-02-03 03:10:58 +01:00
Laurent Destailleur	229199aaad	FIX #4497	2016-02-03 01:32:50 +01:00
Laurent Destailleur	e22664b8cf	FIX #4528	2016-02-03 01:01:14 +01:00
Laurent Destailleur	547ffd7fcc	Add missing phpunit tests	2016-02-02 17:26:14 +01:00
Laurent Destailleur	d88cd500ce	Merge pull request #4547 from bafbes/dev1 fix:remove project info in standard document model for expense reports when project module is disabled	2016-02-02 16:41:12 +01:00
Laurent Destailleur	82cc0b409c	Merge pull request #4546 from bafbes/bra provide link section in expense reports and add option for intervention	2016-02-02 16:17:25 +01:00
Laurent Destailleur	0def82f596	Merge pull request #4543 from aspangaro/develop-export New: Add User accountancy code in user export	2016-02-02 15:32:56 +01:00
Laurent Destailleur	43ac8b72a3	Merge pull request #4542 from aspangaro/3.9-p9 New accountancy menu for auguria	2016-02-02 15:32:32 +01:00
PeartreeG	4c0f29d234	Update fichinter.lib.php	2016-02-02 14:05:58 +01:00
Florian HENRY	3c94f5d4d4	Add log into next values	2016-02-02 11:38:32 +01:00
PeartreeG	c1ff21c30a	add fichinter link to resources	2016-02-01 16:09:58 +01:00
Laurent Destailleur	64514b38da	Merge remote-tracking branch 'origin/3.9' into develop	2016-02-01 01:23:41 +01:00
Laurent Destailleur	f22373b70b	Fix bad management of option MAIN_HTML_TITLE	2016-02-01 01:19:37 +01:00
abb	3bcfe849a1	fix:remove project info in standard document model for expense reports when project module is disabled	2016-01-31 22:35:09 +01:00
abb	773ee5c0ea	provide link section in expenses and add option for intervention	2016-01-31 19:59:47 +01:00
Laurent Destailleur	475cc24e13	NEW Can edit next execution date of a cron job.	2016-01-31 15:37:23 +01:00
Laurent Destailleur	928336c835	NEW Clean and enhance code for cron engine	2016-01-31 15:14:50 +01:00
Laurent Destailleur	426e9297ea	Prepare code to match cron rule: 0 if ok, !=0 if error	2016-01-31 14:20:02 +01:00
PeartreeG	d1018760df	Update resource.lib.php	2016-01-31 12:24:19 +01:00
PeartreeG	4c025d4323	Adding additional tabs	2016-01-31 12:23:05 +01:00
abb	2f40233e01	fix : handle case of non existing third party field in object in fecth_thirdparty function	2016-01-31 10:35:56 +01:00
aspangaro	6a12cdc876	New: Add User accountancy code in export	2016-01-31 08:18:47 +01:00
aspangaro	2fa01a1754	Merge remote-tracking branch 'Upstream/3.9' into 3.9-p9	2016-01-31 07:33:57 +01:00
aspangaro	c77fda5128	New accountancy menu for auguria	2016-01-31 07:31:48 +01:00
BENKE Charlie	324c1123e0	Update contacts.tpl.php if permission modules right are not in french	2016-01-30 17:21:42 +01:00
Bahfir Abbes	32b6f20754	Update smtps.class.php Set mail reply-to field to sender	2016-01-30 17:13:58 +01:00
Laurent Destailleur	71edb3f061	Fix phpcs	2016-01-30 16:57:00 +01:00
Laurent Destailleur	e3a4124a58	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/accountancy/bookkeeping/card.php htdocs/accountancy/class/html.formventilation.class.php htdocs/core/menus/standard/eldy.lib.php htdocs/langs/fr_FR/bills.lang	2016-01-30 16:13:06 +01:00
Laurent Destailleur	5e9fd25a6e	Merge remote-tracking branch 'origin/3.8' into 3.9	2016-01-30 15:59:40 +01:00
mic9p	8faeac611a	Do not select siren but tva_intra from societe VAT report by customer shows an empty field.	2016-01-30 15:35:28 +01:00
Laurent Destailleur	5212303208	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9	2016-01-30 15:29:52 +01:00
Laurent Destailleur	d21908755e	FIX Import/Export NPR VAT	2016-01-30 15:29:35 +01:00
Laurent Destailleur	c6a6889d79	Merge pull request #4389 from aspangaro/3.9-p6 Fix: Some problems presentation on accountancy module	2016-01-30 13:04:22 +01:00
mic9p	827fd39658	Do not select siren but tva_intra from societe VAT report by customer shows an empty field.	2016-01-30 10:35:57 +01:00
BENKE Charlie	d79478e66d	Add hook on contacttpl The goal is to display additionnal feature a the bottom of the contact page like display contact adress and print stamp directly Another way is to show on a google maps the travel to do between us and the multiple thirdpartie present	2016-01-30 09:43:02 +01:00
Laurent Destailleur	19d119d3a4	Debug cron module. Task to delete temporary files older than 24 is on by default.	2016-01-30 02:51:26 +01:00
Laurent Destailleur	1854f07e5c	Move code to purge files into a dedicated utils class (cron job need class)	2016-01-30 00:12:58 +01:00
Laurent Destailleur	7c2ac4b3ee	NEW The probability of lead/opportunity can be defined per lead.	2016-01-28 20:04:02 +01:00
Laurent Destailleur	cd58c93de6	FIX If option to hide automatic ECM is on, dont show menu.	2016-01-28 12:51:34 +01:00
Laurent Destailleur	99b2236260	FIX Selection of project must no show closed project	2016-01-28 12:19:13 +01:00
Laurent Destailleur	c09fa6e0dd	Fix empty keys are not allowed into select	2016-01-28 12:19:06 +01:00
Laurent Destailleur	df4cd3de17	FIX Selection of project must no show closed project	2016-01-28 12:05:14 +01:00
Laurent Destailleur	06bbf4c966	Fix empty keys are not allowed into select	2016-01-27 21:10:42 +01:00
phf	4baff7898d	FIX insert FactureLigne FIX phpunit PriceTest with new values returned for multicurrency module NEW add test in PriceTest FIX FactureTest properties not defined	2016-01-26 22:18:31 +01:00
phf	83f90e2b1f	Merge branch 'new_multicurrency_module' of github.com:atm-ph/dolibarr into new_multicurrency_module Conflicts: htdocs/commande/card.php	2016-01-25 21:50:43 +01:00
phf	b2b787f1ff	FIX Travis	2016-01-25 21:33:14 +01:00
phf	8e933ebb2d	Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module	2016-01-25 19:31:35 +01:00
Laurent Destailleur	ce02f05d43	Translation of dashboard	2016-01-25 17:18:17 +01:00
Laurent Destailleur	274caf61eb	NEW Add statistics for interventions module	2016-01-25 13:34:05 +01:00
Laurent Destailleur	467dc12a7b	NEW Module "Supplier commercial proposal" (price request) is set to stable status.	2016-01-25 12:33:38 +01:00
Laurent Destailleur	ba833dc412	Work on CMS module	2016-01-24 21:35:41 +01:00
Laurent Destailleur	8d46a56dac	Work on CMS module	2016-01-24 21:17:11 +01:00
Laurent Destailleur	c1ebdd3b4f	Default url is home	2016-01-24 11:35:33 +01:00
aspangaro	73d5e7036f	Refactoring eldy menu to test	2016-01-24 08:21:18 +01:00
aspangaro	e5808f876d	Merge remote-tracking branch 'Upstream/3.9' into 3.9-p6	2016-01-24 07:04:20 +01:00
phf	963d0c396b	FIX change rate on order/invoice do not update lines NEW if we change the currency on already existing propal/order/invoice the current rate is update too then update lines	2016-01-23 21:36:07 +01:00
Laurent Destailleur	469a44a4cf	NEW Include number of linked files into badge counter of "Linked files" tab.	2016-01-23 17:23:00 +01:00
Laurent Destailleur	da93e35dbb	NEW Include number of linked files into badge counter of "Linked files" tab.	2016-01-23 17:19:34 +01:00
phf	9376699299	FIX travis missing comment for new param	2016-01-23 16:16:15 +01:00
phf	373225272b	FIX reorder the display of currency and rate on propal/order FIX update line on propal/order NEW add mulitcurrency on customer invoice	2016-01-23 16:01:55 +01:00
Laurent Destailleur	4df584e57b	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/core/lib/files.lib.php	2016-01-23 11:51:56 +01:00
Laurent Destailleur	dbaa43f3be	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/fourn/commande/card.php htdocs/holiday/card.php htdocs/holiday/list.php htdocs/user/card.php	2016-01-23 11:45:39 +01:00
Laurent Destailleur	dc438792f4	Merge remote-tracking branch 'origin/3.7' into 3.8 Conflicts: htdocs/fourn/commande/card.php	2016-01-23 11:39:37 +01:00
Laurent Destailleur	9be246baa5	Merge remote-tracking branch 'origin/3.6' into 3.7	2016-01-23 11:32:06 +01:00
phf	e86ebd6799	NEW add multicurency on customer order	2016-01-23 00:38:17 +01:00
phf	21db62d645	FIX multicurrency price always display and update line price if rate is update	2016-01-22 22:35:32 +01:00
Laurent Destailleur	fedf1f3288	Fix view of product image when using old path Fix size of image uploaded on user.	2016-01-22 14:02:48 +01:00
Laurent Destailleur	a406334643	Merge pull request #4458 from atm-alexis/FIX_bad_pdf_refetch_erase_hook_modification FIX line refetch incompatible with hook practice	2016-01-22 04:10:06 +01:00
Laurent Destailleur	93b2013aa7	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/compta/bank/card.php htdocs/projet/tasks/list.php	2016-01-22 03:29:55 +01:00
Laurent Destailleur	cceeefb7c2	Merge remote-tracking branch 'origin/3.8' into 3.9 Conflicts: htdocs/societe/index.php	2016-01-22 03:25:30 +01:00
Laurent Destailleur	cbd01bae49	Merge remote-tracking branch 'origin/3.7' into 3.8 Conflicts: htdocs/admin/dict.php htdocs/core/tpl/objectline_edit.tpl.php htdocs/societe/index.php	2016-01-22 03:18:51 +01:00
Laurent Destailleur	d857b3475b	Fix doxygen	2016-01-22 03:07:46 +01:00
Laurent Destailleur	cc71445b45	Fix: Only one name for one same feature.	2016-01-22 02:41:51 +01:00
Laurent Destailleur	e6653ea14f	Merge pull request #4333 from defrance/patch-94 Parameters harmonization of hook call	2016-01-22 02:35:21 +01:00
Laurent Destailleur	d2f5f5c01f	Merge pull request #4266 from fappels/develop_multi_warehouse Add shipping and dispatching from/to multiple warehouses	2016-01-22 02:26:25 +01:00
Laurent Destailleur	d7847a8ec8	Merge pull request #4256 from GPCsolutions/dolibarr-mysqli [Qual] mysqli code review	2016-01-22 02:22:47 +01:00
Laurent Destailleur	219ce73ea2	Merge pull request #4417 from atm-arnaud/3.8_fix_factures_nblignes_after_hook FIX nblignes not calculated after hook and hook can't modify this val...	2016-01-22 02:10:36 +01:00
Laurent Destailleur	4e87afddf1	Fix: why a floating float here ?	2016-01-21 22:44:05 +01:00
Laurent Destailleur	35d9b25d82	Fix: why a floating float here ?	2016-01-21 22:43:20 +01:00
phf	68857499d7	NEW display multicurrency price on azur pdf model	2016-01-21 22:26:51 +01:00
phf	8487058c98	FIX add input multicurrency_subprice on edit line	2016-01-21 21:54:57 +01:00
phf	f7afbcff68	NEW integration of multicurrency module (creation fields in database and admin) NEW add multicurrency_code on create, update and fetch company object NEW add multicurrency on propal FIX travis FIX back quote into sql file	2016-01-21 21:38:52 +01:00
Laurent Destailleur	dd6e60630d	Fix size of cells make page too large even for large screen	2016-01-21 15:01:53 +01:00
Laurent Destailleur	3c68ac55b9	Fix missing loading lang	2016-01-21 15:00:39 +01:00
Laurent Destailleur	19bcdb6910	Fix size of cells make page too large even for large screen	2016-01-21 14:56:26 +01:00
jfefe	7c4a9d140b	Replace reserved keyword "Resource" by "DolResource" # Conflicts: # htdocs/resource/list.php	2016-01-21 11:26:21 +01:00
Laurent Destailleur	b8f52edf84	FIX: Sql syntax error in doc_generic_task_odt	2016-01-21 11:20:27 +01:00
phf	605d830d10	FIX if we dont use SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE the hour is displayed on pdf	2016-01-21 11:20:27 +01:00
Laurent Destailleur	988c0131d2	Fix: markRate can be 100	2016-01-21 11:20:27 +01:00
Laurent Destailleur	236d4d7771	Fix add Croatia into list of country in EEC	2016-01-21 11:20:27 +01:00
Sergio Sanchis Climent	4d75039688	Edited correctly for check values	2016-01-21 11:20:27 +01:00
Sergio Sanchis Climent	0467dac43d	Fix userlocaltax Is posible userlocaltax1_rate or userlocaltax2_rate have value 0.0000 and no enter in if, now check if diferent 0 and now enter	2016-01-21 11:20:27 +01:00
Laurent Destailleur	03461d124a	Fix activation of cron jobs by external module Clean code for task lists pages.	2016-01-19 23:45:03 +01:00
Laurent Destailleur	7c445a6d66	Fix missing loading lang	2016-01-19 12:06:11 +01:00
Alexis Algoud	48d674578b	FIX line is refetch (and seems useless) unless it was modified by the hook previous calling	2016-01-19 11:54:07 +01:00
Laurent Destailleur	0f456c46ab	Clean project pages to work like other modules	2016-01-18 16:43:15 +01:00
Laurent Destailleur	8e882b4cc2	NEW Add warning on tasks when they are late (add also the warning tolerance parameter)	2016-01-18 15:56:51 +01:00
Laurent Destailleur	9642967c1f	NEW Indicator on workboard are red/green if late or not.	2016-01-18 12:57:24 +01:00
Laurent Destailleur	6bccac5691	NEW Add Expense report to approve into workboard NEW Selection of boxes is move on top	2016-01-18 11:35:45 +01:00
Marcos García de La Fuente	da637db162	FIX #4440 Wrong price is filled by Product::fetch into multiprices arrays	2016-01-18 10:17:59 +01:00
Laurent Destailleur	4b94c2ade7	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-01-17 19:03:23 +01:00
Laurent Destailleur	2f3baca9b4	Fix bad translation	2016-01-17 19:03:12 +01:00
Laurent Destailleur	be4f9baac6	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2016-01-16 10:21:52 +01:00
Laurent Destailleur	d46c655fb4	FIX: Sql syntax error in doc_generic_task_odt	2016-01-16 10:20:14 +01:00
Laurent Destailleur	4a009d2ad2	NEW On translation admin page, admin can overwrite a translation value.	2016-01-16 00:48:14 +01:00
Laurent Destailleur	7f4386f739	Merge remote-tracking branch 'origin/3.9' into develop	2016-01-15 01:53:21 +01:00
Laurent Destailleur	6acd31f8ad	Fix: style required in create or edit mode only	2016-01-15 00:44:38 +01:00
Laurent Destailleur	85898ec977	Fix bad test	2016-01-14 23:48:47 +01:00
Laurent Destailleur	524614ded9	Start to work on a per type view of agenda	2016-01-14 16:52:46 +01:00
Laurent Destailleur	a6416b8797	Merge remote-tracking branch 'origin/3.9' into develop	2016-01-14 15:00:59 +01:00
Laurent Destailleur	0951042dad	Fix: no need of translation tab if multilang was disabled.	2016-01-14 15:00:31 +01:00
arnaud	8b2541ebf9	FIX nblignes not calculated after hook and hook can't modify this value. Usefull for modules	2016-01-14 14:10:50 +01:00
Laurent Destailleur	fef3bed4ba	Fix bad name of var	2016-01-14 13:32:31 +01:00
Laurent Destailleur	7b14b5e115	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/core/menus/standard/eldy.lib.php	2016-01-14 13:30:27 +01:00
Laurent Destailleur	23e90974c4	Prepare to split module supplier into supplier_order and supplier_invoice	2016-01-14 13:24:49 +01:00
Laurent Destailleur	23dd6b8388	Fix bad management of option SOCIETE_DISABLE_PROSPECTS and SOCIETE_DISABLE_CUSTOMERS	2016-01-14 12:35:55 +01:00
Laurent Destailleur	63ebd40ceb	Fix bad var value	2016-01-14 11:22:59 +01:00
Laurent Destailleur	0f5e208127	Merge remote-tracking branch 'origin/3.9' into develop	2016-01-13 20:43:49 +01:00
Laurent Destailleur	13f10d55fc	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-01-13 20:42:32 +01:00
Laurent Destailleur	71b264dd86	FIX Bug: Delivery order and date are not displayed #4372 Link between shipment and delivery receipt was lost. Status for receipt must not use same label than shipments.	2016-01-13 20:41:32 +01:00
fappels	284722ef3c	Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_multi_warehouse	2016-01-13 16:41:34 +01:00
phf	d213fbae08	FIX invoice situation	2016-01-13 13:42:58 +01:00
Laurent Destailleur	9ba25be9bb	Change category for application	2016-01-13 13:37:24 +01:00
Laurent Destailleur	f74dfe282b	Fix missing default setup when module is enabled	2016-01-13 13:36:44 +01:00
Laurent Destailleur	d396612a7c	NEW: Add a new method for margin calculation. Added margin on "cost price" to margin on WAP price and margin on "best supplier price".	2016-01-13 12:48:59 +01:00
Raphaël Doursenaud	9eff599f97	[Qual] Mysqli: constructor cannot return a value	2016-01-13 11:55:59 +01:00
Raphaël Doursenaud	aeb3935e31	[Qual] Mysqli: escape with the proper method	2016-01-13 11:55:59 +01:00
Raphaël Doursenaud	87762f14b5	[Qual] Mysqli: OOP style	2016-01-13 11:55:59 +01:00
Raphaël Doursenaud	daa3ce3591	[Qual] Mysqli: set charset with recommended method	2016-01-13 11:55:59 +01:00
Laurent Destailleur	381eea0dbf	Merge remote-tracking branch 'origin/3.9' into develop Conflicts: htdocs/core/menus/init_menu_auguria.sql htdocs/core/menus/standard/eldy.lib.php	2016-01-12 23:10:25 +01:00
fappels	51b08f579b	Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_multi_warehouse Fix Conflicts:	2016-01-12 13:56:00 +01:00
phf	f280061a90	FIX if we dont use SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE the hour is displayed on pdf	2016-01-12 11:09:47 +01:00
Laurent Destailleur	a9f0d6964a	Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8	2016-01-10 18:47:47 +01:00
Laurent Destailleur	801e2bca4b	Fix #4239	2016-01-10 18:42:35 +01:00
Laurent Destailleur	cdaccf7c4b	Fix: markRate can be 100	2016-01-10 18:28:50 +01:00
aspangaro	a88773cb81	Fix: Some problems presentation on accountancy module	2016-01-10 15:44:14 +01:00
Laurent Destailleur	70b57322a2	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2016-01-10 13:05:35 +01:00
Laurent Destailleur	6685502d5c	Fix add Croatia into list of country in EEC	2016-01-10 13:05:22 +01:00
Laurent Destailleur	e9e081bc37	Merge pull request #4292 from bafbes/patch-13 Include local constants files and fetch their values to the correspon…	2016-01-10 12:03:40 +01:00
Laurent Destailleur	6684bdce84	Merge pull request #4349 from benlo06/fr_4347 CLOSE #4347 Add payment label to invoices csv exports	2016-01-10 11:47:25 +01:00
Laurent Destailleur	70ffcfea33	Merge pull request #4380 from aspangaro/3.9-p4 Fix: Donation some problems with french article	2016-01-10 11:46:12 +01:00
aspangaro	965a96784c	Fix: Donation some problems with french article	2016-01-10 07:35:00 +01:00
aspangaro	af9e46d179	Fix: Wrong language file for 2 menu entries in accountancy module	2016-01-10 06:56:20 +01:00
Laurent Destailleur	8653e7fa5c	Merge remote-tracking branch 'origin/3.9' into develop	2016-01-10 00:12:51 +01:00
Laurent Destailleur	2764fb240f	Fix text color for category tags Fix banner for category translation tab	2016-01-10 00:11:49 +01:00
Juanjo Menent	c47e18b7e2	Merge pull request #4197 from atm-ph/new_mail_input_file_multiple NEW hidden conf to use input file multiple from mail form	2016-01-09 17:57:50 +01:00
Juanjo Menent	c7ae943e57	Merge pull request #4311 from FHenry/develop NEW : if nb total of lines provided in print barre_liste, display beside title	2016-01-09 17:52:05 +01:00
Juanjo Menent	56af0761ee	Merge pull request #4295 from aspangaro/develop-a8 Accountancy Add a list to select accounting account on donation admin	2016-01-09 17:46:02 +01:00
Juanjo Menent	095ee47724	Merge pull request #4268 from aspangaro/develop-a7 Accountancy Review page to init accountancy on product/service	2016-01-09 17:45:42 +01:00
Juanjo Menent	400a1f9825	Merge pull request #4253 from aspangaro/develop-a5 Move fiscal year from accountancy module to configuration of Dolibarr	2016-01-09 17:42:29 +01:00
Laurent Destailleur	b2924885aa	Fix css	2016-01-09 03:00:12 +01:00
Laurent Destailleur	a8758fa5b7	Bug war week-end: Fix a duplicate page on holiday, fix missing badge on some documents tabs.	2016-01-09 01:54:46 +01:00
Laurent Destailleur	e5d0bc9d57	Fix permission not used	2016-01-09 00:34:15 +01:00
Laurent Destailleur	a0d11e157b	Fix select2 component go over parent container so we introduce option to deal this.	2016-01-08 23:17:45 +01:00
Laurent Destailleur	de36db19bc	Fix do not show warehouse for shipment on not predefined product	2016-01-08 18:15:53 +01:00
Benlo	4aef3d29c1	FIX 4347 : Add labels in translations and change order	2016-01-08 15:03:46 +01:00
Laurent Destailleur	d4aa83e7ca	Merge pull request #4343 from grandoc/develop translations	2016-01-08 14:07:05 +01:00
Laurent Destailleur	cbe65fbc79	Fix: fields added into 3.8 to store email event was not enough. To late to use them. Will be done into 4.0	2016-01-08 13:05:56 +01:00
Benlo	00b77bafbe	CLOSE #4347 Add payment label to invoices csv exports For CSV export, add the possibility to export the column libelle (name of payment)	2016-01-07 14:20:54 +01:00
Laurent Destailleur	befe58ab98	Fix selection of first entry into select	2016-01-07 13:44:19 +01:00
Laurent Destailleur	4e2d4a6651	Fix: the new option AGENDA_USE_EVENT_TYPE_DEFAULT was not visible. Solved this by completing tooltip info.	2016-01-07 11:01:37 +01:00
philippe grand	7b7f2e9fed	translations	2016-01-07 10:07:05 +01:00
Sergio Sanchis Climent	dfdf58051e	Edited correctly for check values	2016-01-07 09:37:04 +01:00
Laurent Destailleur	2945d2d171	Fix bad condition to show tabs	2016-01-07 00:05:28 +01:00
Laurent Destailleur	d6c5a73264	Fix missing payment fields definition in export	2016-01-06 17:37:01 +01:00
BENKE Charlie	428b10d26b	Update doc_generic_supplier_proposal_odt.modules.php	2016-01-06 10:55:37 +01:00
BENKE Charlie	cd2e4a5e1e	Update doc_generic_proposal_odt.modules.php	2016-01-06 10:53:11 +01:00
BENKE Charlie	cbb5f522eb	Update doc_generic_task_odt.modules.php	2016-01-06 10:39:18 +01:00
BENKE Charlie	e6fd718e51	Update doc_generic_project_odt.modules.php	2016-01-06 10:38:06 +01:00
BENKE Charlie	16d43b169c	Update doc_generic_invoice_odt.modules.php	2016-01-06 10:36:34 +01:00
BENKE Charlie	743967a9b3	Update doc_generic_shipment_odt.modules.php	2016-01-06 10:35:43 +01:00
BENKE Charlie	ef597395ba	Update doc_generic_order_odt.modules.php	2016-01-06 10:34:55 +01:00
bobby	7414e4c07c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2016-01-05 10:30:15 +01:00
Sergio Sanchis Climent	ffd7f4ea30	Fix userlocaltax Is posible userlocaltax1_rate or userlocaltax2_rate have value 0.0000 and no enter in if, now check if diferent 0 and now enter	2016-01-05 09:47:14 +01:00
BENKE Charlie	5e9b7f07d6	Update doc_generic_odt.modules.php	2016-01-04 15:09:18 +01:00
BENKE Charlie	7d6eb270b8	Update doc_generic_proposal_odt.modules.php	2016-01-04 15:08:44 +01:00
BENKE Charlie	16770d3d3f	Update doc_generic_task_odt.modules.php	2016-01-04 15:08:08 +01:00
BENKE Charlie	0d2a6a9868	Update doc_generic_project_odt.modules.php	2016-01-04 15:07:42 +01:00
BENKE Charlie	522f17e6f9	Update doc_generic_invoice_odt.modules.php	2016-01-04 15:07:17 +01:00
BENKE Charlie	11bef2d044	Update doc_generic_shipment_odt.modules.php	2016-01-04 15:06:50 +01:00
BENKE Charlie	99f3df6128	Update doc_generic_order_odt.modules.php	2016-01-04 15:06:28 +01:00
BENKE Charlie	2f56df4899	Update doc_generic_odt.modules.php	2016-01-04 15:03:05 +01:00
BENKE Charlie	a4d24a04a7	Update doc_generic_proposal_odt.modules.php	2016-01-04 15:00:46 +01:00
BENKE Charlie	b308baaf27	Update doc_generic_task_odt.modules.php	2016-01-04 14:58:57 +01:00
BENKE Charlie	f4953a3a6e	Update doc_generic_project_odt.modules.php	2016-01-04 14:55:53 +01:00
BENKE Charlie	e41fe61ab0	Update doc_generic_invoice_odt.modules.php	2016-01-04 14:53:28 +01:00
BENKE Charlie	88912b29d9	Update doc_generic_shipment_odt.modules.php	2016-01-04 14:51:15 +01:00
BENKE Charlie	66834df34c	Update doc_generic_order_odt.modules.php	2016-01-04 14:47:47 +01:00
BENKE Charlie	768ef73f49	Parameters harmonization of hook execute call	2016-01-04 14:43:38 +01:00
Laurent Destailleur	1e1d6d4955	Fix to be able to use dolibarr with a smartphone	2016-01-03 19:34:19 +01:00
Laurent Destailleur	b2c41d8565	Fix search forms	2016-01-03 18:46:10 +01:00
Laurent Destailleur	abe3f192fa	Debug and fix when using dolibarr with jmobile	2016-01-03 16:23:23 +01:00
Laurent Destailleur	96e5651ed5	Fix missing field on list. Restor ability to search on supplier ref.	2016-01-03 14:38:47 +01:00
Laurent Destailleur	d5fa91f7ba	Fix several bugs in css and in jmobile usage	2016-01-02 20:48:19 +01:00
Laurent Destailleur	04c5516483	Fix the format "dayall" does not exists. Instead add missing format "_locale" using correct language file.	2016-01-02 11:51:40 +01:00
Laurent Destailleur	865d93b19e	Merge pull request #4324 from defrance/patch-93 Add rfc and dayall format for extrafields date	2016-01-02 11:39:42 +01:00
Laurent Destailleur	1ae4bef04b	Fix conflict with the div #dialog used for popup cut and paste of address.	2016-01-02 00:27:14 +01:00
BENKE Charlie	dbb8e49654	Update commondocgenerator.class.php	2016-01-01 12:47:27 +01:00
BENKE Charlie	b1aba4b93b	Add rfc and dayall format for extrafields date	2015-12-31 18:50:28 +01:00
Laurent Destailleur	2cbcbb8f85	Merge pull request #4319 from ParisLiakos/develop FIX MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is always overriden	2015-12-31 15:04:16 +01:00
Laurent Destailleur	a234482d08	FIX #3694	2015-12-31 14:55:53 +01:00
Laurent Destailleur	c004342976	FIX #3694	2015-12-31 14:55:10 +01:00
aspangaro	2c1ff3ca47	Merge remote-tracking branch 'Upstream/develop' into develop-a7 Conflicts: htdocs/langs/en_US/accountancy.lang	2015-12-31 06:07:08 +01:00
Paris Liakos	b6b422042c	MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is always overriden	2015-12-29 03:43:49 +02:00
bobby	68b3480c86	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-12-28 11:46:02 +01:00
bobby	46532ccb55	FIX/NEW : Accountancy	2015-12-28 11:08:14 +01:00
bobby	eec22169e3	FIX feature	2015-12-28 10:21:38 +01:00
bobby	10ff19eb46	NEW : if nb total of lines provided in print barre_liste, display in title	2015-12-28 10:20:23 +01:00
Laurent Destailleur	6f474c403c	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/commande/class/commande.class.php htdocs/filefunc.inc.php htdocs/product/list.php htdocs/societe/notify/card.php htdocs/societe/price.php	2015-12-27 19:15:20 +01:00
Bahfir Abbes	ce49c0d5dc	Update conf.class.php I used dol_sanitizeFileName only for $file in order to not clean the two '/' characters needed in the path	2015-12-27 18:27:18 +01:00
Laurent Destailleur	5afed31265	Merge pull request #4305 from marcosgdf/bug-4036 FIX #4036 Direct printing module without any driver configured, shows an unformatted error message	2015-12-27 17:37:29 +01:00
Laurent Destailleur	a9b52f36e6	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-12-27 17:06:05 +01:00
Laurent Destailleur	c64eac5e72	Fix doc and mysql min version	2015-12-27 17:05:56 +01:00
Marcos García de La Fuente	c40c695d20	FIX #4036 Direct printing module without any driver configured, shows an unformatted error message	2015-12-27 14:58:33 +01:00
bobby	e557c002c8	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-12-26 11:56:10 +01:00
aspangaro	e0da56bcd0	Accountancy Add a list to select accounting account on donation admin	2015-12-26 05:56:14 +01:00
Marcos García de La Fuente	686348a0d6	FIX #4287 SQL error when accessing an unexisting proposal	2015-12-25 11:47:48 +01:00
Bahfir Abbes	0027e1a8ba	Include local constants files and fetch their values to the corresponding database constants Modules may declare their file constants in a file named as : "module name"_consts.php and located in the module root folder. They may also assign a correspondence between file constants they define and their equivalent database constants in a table named $file2bddconsts defined in their constants file. To get this two functions the module need to add its name to the list of modules in LOCAL_CONSTS_FILES.	2015-12-24 20:25:54 +01:00
Laurent Destailleur	a4d5e022cf	Fix pagination on limit failed when limit was forced on url	2015-12-24 12:52:11 +01:00
Laurent Destailleur	66e0c1285e	Disable a bugged box	2015-12-24 11:38:30 +01:00
Laurent Destailleur	74e8738ca7	Fix: if option to select thirdparties using a combo box after n chars was on, it was no more possible to clear the filter.	2015-12-24 11:24:56 +01:00
Florian HENRY	930eb6dccf	FIX : bug with head.lib.js if MAIN_MAX_DECIMALS_SHOWN use ... FIX : List of supplier order to invoice must use billed new column	2015-12-23 14:15:30 +01:00
aspangaro	ec7cffd6a4	Merge remote-tracking branch 'Upstream/develop' into develop-a7	2015-12-22 07:11:10 +01:00
Laurent Destailleur	ad5f65e988	Fix: use the mini image on tooltip of thirdparties	2015-12-21 17:32:57 +01:00
Laurent Destailleur	db7a98f0ef	Fix: When a payment mode was disabled, it was not visible on old records. Fix: init of $limit not correctly set according to 3.9 rules on most pages.	2015-12-21 13:56:59 +01:00
Laurent Destailleur	536413523a	Fix to show ref of linked object on documents. Fix is not complete but stable.	2015-12-21 12:52:10 +01:00
Laurent Destailleur	0a515ca8c0	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/compta/facture/class/facture.class.php	2015-12-21 12:38:23 +01:00
Laurent Destailleur	7e03aaee23	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-12-21 12:25:47 +01:00
Laurent Destailleur	96b6f0d8fb	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: composer.json htdocs/product/ajax/products.php htdocs/product/class/product.class.php	2015-12-21 12:24:24 +01:00
Laurent Destailleur	b179a193dd	Fix param for username is $username and not $login	2015-12-21 03:01:37 +01:00
Laurent Destailleur	a2ae9b9cfc	Fix forget password page must have a different title then login page Fix Missing translations	2015-12-21 00:47:44 +01:00
aspangaro	e38106019d	Add conditions to show menu on modules admin tools	2015-12-20 08:11:33 +01:00
aspangaro	e043098cc3	Add link in modules tools & correct auguria menu	2015-12-20 07:58:54 +01:00
Laurent Destailleur	f0802eb36b	FIX #4245 PHP 7	2015-12-19 19:48:36 +01:00
Laurent Destailleur	9334cf8fd1	FIX #4243 sql injection	2015-12-19 18:03:08 +01:00
Laurent Destailleur	d7e9c92144	Fix bad link on category Fix cancel button on categories Css enhancement.	2015-12-19 13:55:27 +01:00
aspangaro	8b3a5ac06f	Correct on auguria module	2015-12-19 06:39:25 +01:00
aspangaro	dc6143b6c7	Depend on accountancy module activation for the moment	2015-12-19 06:25:24 +01:00
aspangaro	2de5db927e	Merge remote-tracking branch 'Upstream/develop' into develop-a5	2015-12-19 05:50:19 +01:00
Laurent Destailleur	b1051c7396	Fix picto	2015-12-19 03:30:35 +01:00
Laurent Destailleur	a973c91c24	Fix pagination on cron jobs Fix perf when too much lines	2015-12-19 02:39:44 +01:00
Laurent Destailleur	f25a9030eb	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: .travis.yml htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php htdocs/core/modules/commande/doc/pdf_proforma.modules.php htdocs/includes/adodbtime/adodb-time.inc.php htdocs/langs/en_US/accountancy.lang	2015-12-18 22:12:03 +01:00
Laurent Destailleur	dd3f5a32d3	Merge remote-tracking branch 'origin/3.7' into 3.8 Conflicts: .travis.yml composer.json htdocs/accountancy/admin/card.php	2015-12-18 21:20:12 +01:00
Laurent Destailleur	ebf68ecbe0	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: .travis.yml htdocs/contrat/class/contrat.class.php htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php htdocs/core/modules/project/pdf/pdf_baleine.modules.php	2015-12-18 21:03:57 +01:00
fappels	982db2e01f	Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_multi_warehouse	2015-12-18 19:31:02 +01:00
Laurent Destailleur	484dc5937b	Fix regression in sorting	2015-12-18 18:05:07 +01:00
fappels	7fc8007571	New add shipping and dispatching from/to multiple warehouses Add select2 to warehouse selectors Ship customer orderline from multiple warehouses Dispatch client orderline to multiple warehouses	2015-12-18 18:00:31 +01:00
Laurent Destailleur	43044bbb4f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-12-18 17:32:54 +01:00
Laurent Destailleur	eaacfabdf6	Merge pull request #4261 from hregis/3.8_bug Fix: Disable "main.inc.php" hooks with ajax return	2015-12-18 17:32:45 +01:00
Laurent Destailleur	4998516835	Code comment	2015-12-18 17:31:50 +01:00
Laurent Destailleur	724817b966	Merge pull request #4259 from aschio/develop_sunimport Adding extrafields to shipments module	2015-12-18 17:28:35 +01:00
Laurent Destailleur	dc8e5f45ae	Merge pull request #4254 from grandoc/develop [Qual] Uniformize code	2015-12-18 17:13:22 +01:00
Laurent Destailleur	c328860af0	Merge pull request #4250 from GPCsolutions/dolibarr-4242 FIX #4242 Allow disabling dashes in documents	2015-12-18 17:07:00 +01:00
Laurent Destailleur	452feca64a	Merge pull request #4249 from GPCsolutions/3.8-4242 FIX #4242 Allow disabling dashes in documents	2015-12-18 17:06:51 +01:00
Regis Houssin	70354def7c	Fix: Disable "main.inc.php" hooks with ajax return	2015-12-18 13:27:51 +01:00
Laurent Destailleur	98cd4f8307	Fix message so it is more clear what the feature can do or not. Fix list of email templates must be hidden for templates of disabled modules.	2015-12-18 12:48:20 +01:00
cla	cb96618460	Merge branch 'develop' into develop_sunimport	2015-12-18 10:49:57 +01:00
Laurent Destailleur	b10f9d4ca3	Fix: when doing an export of extrafields, we must use different table alias for each extrafield table.	2015-12-17 20:40:33 +01:00
Laurent Destailleur	cdc408a84c	Fix: button "now" was not working on date using no javascript	2015-12-17 17:16:26 +01:00
philippe grand	367d9de0b7	fix some translation	2015-12-17 17:12:28 +01:00
Laurent Destailleur	ba3c8de785	Update doc comment to make things cleaner to avoid confusion between old deprecated doActions of canvas and doActions of triggers.	2015-12-17 14:01:22 +01:00
aspangaro	ea73e0253c	Move fiscal year from accountancy module to configuration of Dolibarr	2015-12-17 13:09:46 +01:00
Raphaël Doursenaud	4f9ab7da24	FIX #4242 Allow disabling dashes in documents 3.9 specific fix since document have moved	2015-12-17 10:39:55 +01:00
Raphaël Doursenaud	7e98cfd5b6	FIX #4242 Allow disabling dashes in documents 3.8 specific fix for new documents	2015-12-17 10:33:17 +01:00
Raphaël Doursenaud	02e053acc6	FIX #4242 Allow disabling dashes in documents 3.7 specific fix since document files have moved	2015-12-17 10:26:27 +01:00
Raphaël Doursenaud	e6ec797af8	FIX #4242 Allow disabling dashes in documents	2015-12-17 10:21:44 +01:00
Laurent Destailleur	acc4623b74	Merge pull request #4236 from defrance/patch-90 fix ErrorBadValueForParamNotAString shit one again...	2015-12-16 19:25:39 +01:00
Laurent Destailleur	516e071363	Merge pull request #4232 from aspangaro/develop-remove_zero New: Accountancy add a function to remove all zero at the right of the account	2015-12-16 19:13:43 +01:00
Laurent Destailleur	4ef832b94b	Merge pull request #4215 from frederic34/patch-7 Update sms.php	2015-12-16 19:02:07 +01:00
cla	ef487c48a4	NEW Extrafields for: - expedition, expeditiondet, livraison, livraisondet	2015-12-16 16:18:29 +01:00
BENKE Charlie	afe3e6ac27	fix ErrorBadValueForParamNotAString shit one again...	2015-12-16 12:38:32 +01:00
aspangaro	36bc1321cb	Merge remote-tracking branch 'Upstream/develop' into develop-remove_zero	2015-12-15 20:50:49 +01:00
aspangaro	c1e77daeb1	New: Accountancy add a function to remove all zero at the right of the account. Thanks to Florian	2015-12-15 20:48:06 +01:00
Laurent Destailleur	90dbfc4870	Fix: to avoid confusion between amount of payment and amount distributed on invoice when a payment is done for several invoices, export of payment can export both fields.	2015-12-15 15:52:20 +01:00
Laurent Destailleur	3e3dbf850f	Fix: bad case for function	2015-12-15 09:44:17 +01:00
Laurent Destailleur	40269c3c70	Fix Remove syntax warnings	2015-12-15 09:43:39 +01:00
aspangaro	687370071b	A function to remove zero at the end of the account	2015-12-14 21:38:30 +01:00
Laurent Destailleur	0ec62c05cc	Fix bad var name. Removed warning.	2015-12-14 09:14:34 +01:00
Frédéric FRANCE	1aa232c4a7	Update CSMSFile.class.php	2015-12-13 21:14:53 +01:00
Laurent Destailleur	dc6ec91b2c	Merge pull request #4183 from IonAgorria/patch-3 JS error preventing hiding of dates at object line	2015-12-13 19:57:37 +01:00
Laurent Destailleur	4d11c8b733	Merge pull request #4212 from frederic34/patch-7 typo	2015-12-13 19:40:08 +01:00
Laurent Destailleur	646a198399	Merge pull request #4214 from frederic34/patch-8 typo	2015-12-13 19:39:56 +01:00
Laurent Destailleur	3b595f0247	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/accountancy/bookkeeping/list.php htdocs/accountancy/customer/list.php htdocs/accountancy/journal/bankjournal.php htdocs/core/lib/date.lib.php htdocs/core/lib/report.lib.php htdocs/langs/en_US/accountancy.lang	2015-12-13 16:23:33 +01:00
Laurent Destailleur	a462cd232d	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-12-13 16:09:09 +01:00
Laurent Destailleur	4a88c9ea9f	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/product/class/product.class.php	2015-12-13 15:53:57 +01:00
Laurent Destailleur	7db6ac592f	FIX Option start tls of ldap was not correctly supported.	2015-12-13 15:51:52 +01:00
Laurent Destailleur	3680202c1c	Fix do not share color for title of table and title of pages	2015-12-13 14:39:12 +01:00
Frédéric FRANCE	9cc77787c5	typo	2015-12-12 16:10:36 +01:00
Laurent Destailleur	2a6fbe3526	Fix debug shipment doc generation (bad position of fields, code differences, text size, ...)	2015-12-12 14:55:32 +01:00
Laurent Destailleur	0330d8237f	Fix: Color too dark	2015-12-12 14:13:45 +01:00
Laurent Destailleur	84205b5be4	Fix: text too long	2015-12-12 14:12:53 +01:00
Frédéric FRANCE	442f669dc7	typo	2015-12-12 10:45:33 +01:00
Ion Agorria	26b85d7cac	Remove unnecesary variable	2015-12-11 18:28:55 +01:00
Laurent Destailleur	f71225742a	Merge pull request #4178 from GPCsolutions/dolibarr-3953 Better javascript rounding	2015-12-11 17:59:34 +01:00
Laurent Destailleur	47fce16778	Merge branch 'develop' of https://github.com/FHenry/dolibarr into FHenry-develop Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2015-12-11 17:04:19 +01:00
Florian HENRY	71d0024b27	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-12-11 11:31:37 +01:00
Ion Agorria	f34fb0d82d	More consistent check	2015-12-11 03:09:09 +01:00
Frédéric FRANCE	e193d9be97	Update CSMSFile.class.php	2015-12-10 23:08:21 +01:00
Raphaël Doursenaud	3e2309d0e6	NEW Factorized price2numjs into lib_head.js.php Used public domain code from the MDN to provide a robust decimal rounding implementation. Warning for developers: the path of the javascript file has changed. Please update your scripts.	2015-12-10 17:03:00 +01:00
Ion Agorria	ceb2920769	Better undefined CKEDITOR fix	2015-12-10 14:17:08 +01:00
phf	2f5f6c9ead	NEW hidden conf to use input file multiple from mail form	2015-12-10 13:48:37 +01:00
Ion Agorria	bbfd138896	Missed another CKEDITOR ref	2015-12-09 18:00:05 +01:00
Raphaël Doursenaud	c0862762a5	Fix #3930 Removed executable bit These files doesn't contain executable code and may pose a security threat.	2015-12-09 13:28:36 +01:00
Florian HENRY	96a95d6ae1	Debug accountancy on 3.9	2015-12-09 12:55:08 +01:00
Ion Agorria	238f977002	JS error preventing hiding of dates at object line The "if (CKEDITOR)" gives "ReferenceError: CKEDITOR is not defined" at JS console causing the next code to don't execute, is this code obsolete?	2015-12-08 15:45:24 +01:00
Raphaël Doursenaud	3f9efc537b	FIX #3953 Don't round supplier price The price is already rounded when inserted on the product page. It's also rounded at display. There's no need to round it here. Rounding it leads to serious calculation errors.	2015-12-07 14:35:04 +01:00
Raphaël Doursenaud	2cf36d157f	FIX #3953 Don't round supplier price The price is already rounded when inserted on the product page. It's also rounded at display. There's no need to round it here. Rounding it leads to serious calculation errors.	2015-12-07 14:24:24 +01:00
Laurent Léonard	05234390f2	Fix uniqueness of objects reference	2015-12-07 02:02:03 +01:00
Laurent Destailleur	7f3531a04c	Enhance script to track duplicate translation string and use it to remove around 50 duplicates.	2015-12-06 13:34:57 +01:00
Laurent Destailleur	374480043e	Add maxwidth300 on combo list for users and sale representatives	2015-12-06 00:37:58 +01:00
Laurent Destailleur	ff4f1e7a5b	Debug 3.9	2015-12-05 19:20:39 +01:00
Laurent Destailleur	4a2bda3491	Look enhancement	2015-12-04 23:25:34 +01:00
Laurent Destailleur	5cd43d2df0	Some debug on new features	2015-12-04 20:51:34 +01:00
Laurent Destailleur	eb795a7a9d	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-12-04 18:39:39 +01:00
Laurent Destailleur	8c03e46a83	Removed a TODO	2015-12-04 18:33:57 +01:00
Laurent Destailleur	d0d7e83929	Merge pull request #4149 from GPCsolutions/dolibarr-php7 [Qual] OOP detection of PHP MySQL driver	2015-12-04 18:25:14 +01:00
Laurent Destailleur	6542da404e	Merge pull request #4129 from aspangaro/develop-bank New HRM Add bank tab in user to pay salary or expense report	2015-12-04 18:23:47 +01:00
Laurent Destailleur	bcadc33e31	Debug visibility on task/projects	2015-12-04 15:37:28 +01:00
aspangaro	6598ac6745	Add rights to see tab (hrm->employee->read)	2015-12-04 12:48:36 +01:00
aspangaro	c30728326e	Merge remote-tracking branch 'Upstream/develop' into develop-bank	2015-12-04 12:41:51 +01:00
Laurent Destailleur	e6ebc9c293	More complete tooltip help	2015-12-04 12:24:36 +01:00
Laurent Destailleur	a24cbf5585	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-12-04 12:12:23 +01:00
Laurent Destailleur	4dd1cb3e77	Theme MD looks ready for 3.9 now.	2015-12-04 12:12:12 +01:00
Laurent Destailleur	2b149aa514	Merge pull request #4148 from AlainRnet/develop Update fraise.modules.php	2015-12-04 10:31:34 +01:00
Laurent Destailleur	7d7a978ba0	Merge pull request #4145 from FHenry/3.8 FIX : Contract date inconsistency between /comm/card.php and #4089	2015-12-04 10:25:50 +01:00
Raphaël Doursenaud	b45d4a2a51	[Qual] OOP detection of PHP MySQL driver	2015-12-03 22:31:13 +01:00
AlainRnet	ebc1105b5c	Update fraise.modules.php following discussion with eldy (https://github.com/Dolibarr/dolibarr/pull/4079#issuecomment-161601400) to mix a french forum membre to select mailing member by type, I try to update this selector to integrate selection by type. Thanks in advance for feedback	2015-12-03 21:09:09 +01:00
Laurent Destailleur	43ab23ca28	Fix doxygen	2015-12-03 14:54:39 +01:00
Laurent Destailleur	1658bee81c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-12-03 13:06:37 +01:00
Laurent Destailleur	480a398f36	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/holiday/card.php htdocs/resource/list.php	2015-12-03 13:06:20 +01:00
Laurent Destailleur	12702ee128	Merge remote-tracking branch 'origin/3.7' into 3.8 Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/core/lib/report.lib.php htdocs/product/stock/class/mouvementstock.class.php	2015-12-03 12:59:13 +01:00
Florian HENRY	3dec67ffdf	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2015-12-03 12:58:39 +01:00
Laurent Destailleur	7105fabb79	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/langs/en_US/users.lang htdocs/product/stock/class/mouvementstock.class.php	2015-12-03 12:51:49 +01:00
Laurent Destailleur	c088de517e	Merge pull request #4140 from GPCsolutions/dolibarr-sql [Qual] More robust sorting	2015-12-03 12:06:01 +01:00
Florian HENRY	10a925f7b4	FIX: WHERE 1=1	2015-12-03 11:52:41 +01:00
Laurent Destailleur	63879c1ca6	Merge pull request #4122 from mrsof/patch-7 FIX: Cannot set property '_renderItem of undefined	2015-12-03 11:52:30 +01:00
Laurent Destailleur	7bad058f47	Merge pull request #4114 from fappels/3.8_fix_round_buyprice FIX #3953 rounding of buying price	2015-12-03 11:48:09 +01:00
Florian HENRY	281eaf2987	FIX : Use "WHERE true" instead of "WHERE 1" #4132	2015-12-03 10:27:23 +01:00
Laurent Destailleur	cb8227f086	Fix syntax error	2015-12-03 10:04:13 +01:00
Laurent Destailleur	055e650adf	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-12-02 23:23:38 +01:00
Laurent Destailleur	574b270da0	Work on the "mass action" feature. Can run mass action on result of a select.	2015-12-02 22:00:39 +01:00
Raphaël Doursenaud	0c5c762c1c	[Qual] More robust sorting Only allow valid values and discard others. Do not use user supplied data in SQL query.	2015-12-02 21:15:59 +01:00
Florian HENRY	bd632cf2b0	FIX : Use "WHERE true" instead of "WHERE 1" #4132	2015-12-02 12:12:26 +01:00
aspangaro	882b66c586	HRM - Add bank tab in user to pay salary or expense report	2015-12-01 06:56:26 +01:00
Laurent Destailleur	de730c9762	NEW Introduce cost price on product.	2015-11-30 21:20:45 +01:00
Sof	daa8399764	FIX: Cannot set property '_renderItem of undefined http://stackoverflow.com/questions/9513251/cannot-set-property-renderitem-of-undefined-jquery-ui-autocomplete-with-html	2015-11-30 20:31:42 +01:00
Sof	292d3ba959	FIX: Cannot set property '_renderItem of undefined http://stackoverflow.com/questions/9513251/cannot-set-property-renderitem-of-undefined-jquery-ui-autocomplete-with-html	2015-11-30 20:28:36 +01:00
Laurent Destailleur	d6d2a2fadb	Merge pull request #4118 from patas-monkey/patch-1 Progress column not wide enough for 100%	2015-11-30 19:16:54 +01:00
Laurent Destailleur	863f81160f	Merge pull request #4116 from IonAgorria/patch-2 Only print : when both $h and $m are set	2015-11-30 18:54:50 +01:00
Sof	09b61fd185	Update extrafields.class.php	2015-11-30 18:06:15 +01:00
Sof	5dab92836b	FIX: Warning: implode(): Invalid arguments passed Declare array type before implode to avoid warning	2015-11-30 12:27:58 +01:00
Romain DESCHAMPS	94101412e9	Progress column not wide enough for 100% Progress column not wide enough for 100%	2015-11-30 12:20:14 +01:00
Ion Agorria	d518b24d55	Only print : when both $h and $m are set	2015-11-29 16:19:30 +01:00
Laurent Destailleur	c55d11869b	Billing of supplier or customer order is a process that can be done in parallel with shipment or reception, so we show the status on another field into lists.	2015-11-29 15:54:32 +01:00
fappels	4a0ea97772	FIX #3953 rounding of buying price fix javascript for rounding of buying price	2015-11-29 15:34:43 +01:00
Laurent Destailleur	480623a6d5	Uniformize GUI. All lists must have a search on status at end and last column is dedicaded to future "mass action checkbox".	2015-11-29 13:03:46 +01:00
Laurent Destailleur	ebe4867ab1	Remove useless information tomake screen lighter	2015-11-29 01:23:41 +01:00
Laurent Destailleur	263be5aa0a	Avoid 2 lines on mall screen	2015-11-29 01:16:56 +01:00
Laurent Destailleur	7b6d8dd23e	Fix for smartphone	2015-11-29 01:13:23 +01:00
Laurent Destailleur	5df193ec93	Uniformize code	2015-11-28 20:25:50 +01:00
Laurent Destailleur	5d5cfd498a	Add holiday date functions into PHPUnit	2015-11-28 19:54:16 +01:00
Laurent Destailleur	fcdb3af708	Merge pull request #4106 from aspangaro/develop-skype New: Better integration of skype for dolibarr 3.9	2015-11-28 16:31:35 +01:00
Laurent Destailleur	5b22eee938	FIX #4099	2015-11-28 16:11:15 +01:00
Laurent Destailleur	3485e351a4	Fix do not jump to top of page when clicking on "Link to order"	2015-11-28 15:46:20 +01:00
aspangaro	d12e3ca91f	Finish work on better integration of skype	2015-11-28 14:43:16 +01:00
phf	cbcb79b1eb	FIX jquery select of project generate js error on change event	2015-11-27 16:58:28 +01:00
aspangaro	9817ce8b20	Merge remote-tracking branch 'Upstream/develop' into develop-skype	2015-11-26 07:12:04 +01:00
aspangaro	9a2259c681	Correct button 'Export' and 'Write bookkeeping' on finance journal	2015-11-26 06:19:24 +01:00
Laurent Destailleur	a6d8f943df	Fix several bugs into leave requets module	2015-11-26 02:12:37 +01:00
Laurent Destailleur	b47dbc7a5f	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/install/pgsql/functions/functions.sql htdocs/projet/element.php	2015-11-26 01:32:21 +01:00
Laurent Destailleur	f353464bce	Prepare code to fix #4095	2015-11-26 00:47:17 +01:00
Laurent Destailleur	8746ee1310	Merge pull request #4067 from aspangaro/develop-donation NEW: Donation complete cerfa 11580*03 Fr - Thanks Benoit21	2015-11-25 23:33:13 +01:00
Laurent Destailleur	9d10533f3d	Merge pull request #4066 from aspangaro/develop-hrm Fix: Auguria Menu & wrong table in dictionary HRM	2015-11-25 23:32:36 +01:00
aspangaro	3457a732f5	New: Better integration of skype	2015-11-25 20:19:18 +01:00
Raphaël Doursenaud	973e42d10f	FIX #4097 Public holiday calculation The last day was ommitted and never parsed. If this day was a saturday, sunday or public holiday day, it was not computed.	2015-11-25 19:34:11 +01:00
Laurent Destailleur	5568ff1c54	Fix bad picto on export	2015-11-25 16:41:40 +01:00
Laurent Destailleur	a1824955f6	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-23 12:21:02 +01:00
Laurent Destailleur	12358c9721	FIX The import help was not visible on calculated fields	2015-11-23 12:20:43 +01:00
Laurent Destailleur	61b46352b7	Dash line was not visible.	2015-11-23 09:36:34 +01:00
aspangaro	71189248d9	Correct description	2015-11-22 21:35:19 +01:00
aspangaro	5bed70b04e	New: Donation complete cerfa 11580*03 Fr - Thanks Benoit21	2015-11-22 21:31:05 +01:00
aspangaro	f9e82721d7	Fix: Auguria Menu & wrong table in dictionary HRM	2015-11-22 20:13:48 +01:00
Laurent Destailleur	ffeae34f51	Update doc	2015-11-22 18:41:35 +01:00
Laurent Destailleur	73bcc3bfe3	The temp dir for cache used by rester is correctly managed: No temp or data files must be stored outside of documents directory.	2015-11-22 17:39:13 +01:00
Laurent Destailleur	296e04022f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-22 17:19:45 +01:00
Laurent Destailleur	99fa751edc	Test lib is available	2015-11-22 17:19:20 +01:00
Laurent Destailleur	3c55479705	Restler #3544	2015-11-22 17:17:06 +01:00
Laurent Destailleur	3aa25cd2be	Merge pull request #4064 from frederic34/escpos Add profile escpos printer	2015-11-22 17:09:15 +01:00
frederic34	6b4b70bdbb	translations and help	2015-11-22 14:11:33 +01:00
Laurent Destailleur	cb3765bc92	Debug module Resource	2015-11-22 12:23:10 +01:00
frederic34	bfd97d5226	Add profile escpos printer	2015-11-22 11:04:27 +01:00
Laurent Destailleur	c7447b0899	Add thirdparty of project into project summary of project home page. Total use a different color	2015-11-21 20:25:28 +01:00
Laurent Destailleur	6f7a3f2c66	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-21 20:00:50 +01:00
Laurent Destailleur	e3c6e4ebe5	NEW Add planned workload and declared progress on project summary list on project home page (data aggregated from tasks of project)	2015-11-21 20:00:38 +01:00
Laurent Destailleur	7b0a9fabab	FIX Order last name / firstname in user list must be done according to option	2015-11-21 18:26:25 +01:00
Laurent Destailleur	7bde781206	Merge pull request #4061 from marcosgdf/bug-3231 FIX #3231 [Members] Public subscription page displays GeoIP error	2015-11-21 17:58:29 +01:00
Laurent Destailleur	c8cf06c14b	Merge pull request #4059 from fappels/develop_fix_defineBuyPrice Fix defineBuyPrice no min price is not error	2015-11-21 17:53:59 +01:00
Laurent Destailleur	dc6496fdf3	Merge pull request #4054 from marcosgdf/bug-3508 FIX #3508 Useless tooltip in 3.8 boxes	2015-11-21 17:49:09 +01:00
Laurent Destailleur	54b6ff02c0	Merge pull request #4048 from FHenry/3.8 FIX Missing fields managed by update_customer_modtime in 3.8	2015-11-21 17:46:02 +01:00
philippe grand	55bab28b9c	Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop	2015-11-21 17:15:56 +01:00
Laurent Destailleur	c15c0f6fbb	Minor css fix	2015-11-21 15:31:27 +01:00
Laurent Destailleur	548ff26628	Focus on textarea works also when ckeditor is on	2015-11-21 13:42:01 +01:00
Marcos García de La Fuente	a456d21249	FIX #3231 [Members] Public subscription page displays GeoIP error	2015-11-21 13:25:09 +01:00
Laurent Destailleur	2a345b6fc0	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/admin/company.php htdocs/admin/menus/edit.php htdocs/core/class/hookmanager.class.php htdocs/core/class/html.form.class.php htdocs/core/lib/pdf.lib.php	2015-11-21 12:48:41 +01:00
fappels	ecd3114683	Fix defineBuyPrice no min price is not error No min buy price is not error, return 0 if no buyprice set	2015-11-21 12:35:45 +01:00
Laurent Destailleur	758b8e1f7e	Merge remote-tracking branch 'origin/3.7' into 3.8 Conflicts: htdocs/core/boxes/box_project.php	2015-11-21 12:32:03 +01:00
Laurent Destailleur	c04743aa84	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-11-21 12:23:51 +01:00
Marcos García de La Fuente	4bf6cf4e65	FIX #3508 Useless tooltip in 3.8 boxes	2015-11-21 11:24:18 +01:00
Florian HENRY	c0d29d2a15	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2015-11-21 10:10:42 +01:00
philippe grand	32f420eefa	[Qual] Uniformize code	2015-11-21 05:20:08 +01:00
philippe grand	928c44b04f	Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop	2015-11-21 04:52:19 +01:00
Laurent Destailleur	60724df496	Merge pull request #4038 from atm-maxime/develop NEW add info page on product card	2015-11-21 01:51:32 +01:00
Laurent Destailleur	9db71098ac	Merge pull request #4031 from FHenry/develop PG SQL	2015-11-21 01:50:47 +01:00
Laurent Destailleur	45d6635bf6	Merge pull request #4025 from ndrosis/3.8 FIX utf-8 characters in the mask mercure does not break counter	2015-11-21 00:26:38 +01:00
Laurent Destailleur	a906774595	Merge pull request #3979 from atm-alexis/3.9_NEW_add_billed_status_for_supplier_order NEW 3.9 add billed status for supplier order	2015-11-21 00:20:17 +01:00
Laurent Destailleur	bf2af33b89	Merge pull request #4015 from ParisLiakos/develop Add a trigger for product translation deletion	2015-11-21 00:19:40 +01:00
Laurent Destailleur	552ecbcd95	Merge pull request #3964 from aspangaro/develop-hrm3 HRM : Work in progress	2015-11-21 00:14:41 +01:00
Drosis Nikos	ee4eb13fff	Update functions2.lib.php	2015-11-20 19:05:00 +02:00
arnaud	07226d32ec	FIX NB task and percent progress in box project	2015-11-20 16:11:48 +01:00
Florian HENRY	b8af7625ff	fix new extrafields feature	2015-11-20 15:29:31 +01:00
Florian HENRY	87c9132a6d	avoid error	2015-11-20 13:59:58 +01:00
Florian HENRY	101b45e397	Continue extrafeild $ID$ and select feature	2015-11-20 13:52:47 +01:00
Florian HENRY	b8cab9f4d9	continue extrafeild $ID$ and SELECT feature	2015-11-20 13:51:57 +01:00
Florian HENRY	4ff0c22e29	continue extrafield ID filter	2015-11-20 13:22:45 +01:00
Florian HENRY	eac28076c9	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-20 11:59:39 +01:00
Florian HENRY	1566be35a1	NEW : add $ID$ into extrafields management to allow use current object id on filter for select list from table and checkbox list from table	2015-11-20 11:59:28 +01:00
arnaud	4233d24f4b	FIX export with category contact extrafields	2015-11-19 18:01:58 +01:00
Florian HENRY	80f19de223	fix && vs and	2015-11-19 16:32:25 +01:00
Maxime Kohlhaas	9c1545bc1b	NEW add info page on product card	2015-11-19 14:45:05 +01:00
philippe grand	4f280f63d0	[Qual] Uniformize code	2015-11-19 13:59:58 +01:00
arnaud	85a58f666a	FIX product link in project box	2015-11-18 17:22:53 +01:00
fmarcet	0cbf8ca1dd	FIX #3726 When upload file, don't test if PRODUCT_USE_OLD_PATH_FOR_PHOTO variable is empty or not	2015-11-18 13:59:25 +01:00
aspangaro	ad457b416d	Use menu & add mode 'employee' in user/index.php	2015-11-17 22:51:34 +01:00
aspangaro	258ac45519	Remove obsolete code	2015-11-17 22:14:39 +01:00
aspangaro	b7b25c9682	Remove some code	2015-11-17 21:04:11 +01:00
aspangaro	a5ca6cb732	Merge remote-tracking branch 'Upstream/develop' into develop-hrm3	2015-11-17 20:34:37 +01:00
Nikos Drosis	5082b1cc66	Fix for utf-8 characters in the mask mercure	2015-11-17 20:22:27 +02:00
BENKE Charlie	ce367bfa31	bad limittoshow usage the value selected in MAIN_MAXTABS_IN_CARD is not well used (particulary when the active tab is present on tabcollector	2015-11-17 14:42:34 +01:00
Laurent Destailleur	6dc6bab556	Support of 'small', 'mini' and '' image size everywhere.	2015-11-17 10:38:00 +01:00
Laurent Destailleur	c6e7413349	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-17 00:58:22 +01:00
Laurent Destailleur	f5631cac45	NEW Introduce property module_position so a module can decide where it appears into list of modules.	2015-11-17 00:58:12 +01:00
Paris Liakos	fb6819764d	Add PRODUCT_DEL_MULTILANGS trigger for translation deletion on product	2015-11-17 01:20:58 +02:00
Laurent Destailleur	a8bfa1a258	Merge pull request #4011 from ParisLiakos/develop Add triggers for product and category translation changes	2015-11-16 23:50:18 +01:00
Laurent Destailleur	508b11733a	Merge pull request #4010 from atm-alexis/3.8_FIX_Allow_to_search_on_alias_name FIX 3.8 allow to search on alias name into select	2015-11-16 23:48:18 +01:00
Laurent Destailleur	0e511027f6	Merge pull request #4003 from marcosgdf/bug-3996 FIX #3996 Dictionnary hooks are not working in 3.8	2015-11-16 23:41:06 +01:00
Paris Liakos	146aa7815b	Add X_SET_MULTILANGS triggers to make possible reacting on translation changes for products and categories	2015-11-16 20:27:51 +02:00
Alexis Algoud	a7d2bdc2c1	FIX 3.8 allow to search on alias name into select	2015-11-16 19:10:20 +01:00
Alexis Algoud	55b23c4918	FIX add billed field in supplier order	2015-11-16 14:55:46 +01:00
Marcos García de La Fuente	8e9e2911ae	FIX #3996 Dictionnary hooks are not working in 3.8	2015-11-16 13:18:25 +01:00
Florian HENRY	c3b7bbfb3b	FIX : #3990	2015-11-15 20:00:11 +01:00
Laurent Destailleur	6bd6be0912	Debug and rename experimental module "supplier proposal". Still work to do: Must fix the PDF to be compliant with a request quotation to a supplier (so no need to show vat, unit price, ...).	2015-11-15 19:23:39 +01:00
Laurent Destailleur	388748055a	Fix missing translation for VAT	2015-11-15 15:08:54 +01:00
Laurent Destailleur	c2ec4a4fd2	Move online help link at a better place (top right). Link is also always visible.	2015-11-14 22:49:34 +01:00
Laurent Destailleur	1da53501a1	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-14 17:54:28 +01:00
Laurent Destailleur	01058be44c	NEW Introduce a "code" into fiels to describe vat. This will allow to suggest different vat lines with same value with ability to differentiate them.	2015-11-14 17:53:58 +01:00
Laurent Destailleur	b4af55ab40	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2015-11-14 14:57:49 +01:00
Laurent Destailleur	b75923871c	FIX: Too many information were hidden. A lot of users still need bank account on PDF.	2015-11-14 14:56:44 +01:00
Laurent Destailleur	5b1e20494b	Merge pull request #3977 from FHenry/3.8 FIX : showrefnav htmlspecialchar instead of < >	2015-11-13 19:22:41 +01:00
Laurent Destailleur	3ff42a45d4	Merge pull request #3976 from atm-alexis/3.9_FIX_htmlname_for_ajax_contact FIX htmlname parameters wasnt applied	2015-11-13 19:22:18 +01:00
Laurent Destailleur	85c0ed39f1	Merge pull request #3974 from atm-ph/fix_38_aufocus FIX autofocus on input search product	2015-11-13 19:21:52 +01:00
Laurent Destailleur	510e3bc4c2	Merge pull request #3975 from All-3kcis/develop-patch-12 Fix #3542	2015-11-13 19:20:24 +01:00
Florian HENRY	2a2155a239	FIX : showrefnav htmlspecialchar instead of < >	2015-11-13 14:40:52 +01:00
Laurent Destailleur	5e67eefff3	Removed phpcs warning	2015-11-13 12:48:17 +01:00
Laurent Destailleur	ab177b43af	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: ChangeLog htdocs/.gitignore htdocs/comm/mailing/card.php htdocs/commande/list.php htdocs/compta/facture.php htdocs/expedition/class/expedition.class.php	2015-11-13 12:35:10 +01:00
Laurent Destailleur	93be4305c4	Merge remote-tracking branch 'origin/3.7' into 3.8 Conflicts: build/makepack-dolibarr.pl htdocs/accountancy/customer/card.php htdocs/accountancy/customer/list.php htdocs/accountancy/supplier/card.php htdocs/accountancy/supplier/list.php htdocs/commande/card.php htdocs/commande/class/commande.class.php htdocs/fichinter/card.php htdocs/societe/rib.php	2015-11-13 12:18:46 +01:00
Alexis Algoud	965de406d3	FIX htmlname parameters wasnt applied	2015-11-13 11:47:15 +01:00
All-3kcis	c59482fea1	Fix #3542	2015-11-13 11:17:23 +01:00
Laurent Destailleur	682842f15f	Fix into title of login page, we must report the tru dolibarr version after the @ (technical information), event if application name/version was replaced with a constant.	2015-11-13 10:37:51 +01:00
phf	81a8933256	FIX autofocus on input search product	2015-11-13 10:36:32 +01:00
aspangaro	0f75d76296	Merge remote-tracking branch 'Upstream/develop' into develop-hrm3	2015-11-13 07:52:44 +01:00
Laurent Destailleur	9a98206d5a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-13 03:36:08 +01:00
Laurent Destailleur	64c783623b	NEW Framework feature. To have a page being loaded at same scrollbar level wafter a click on a href link, just add the class "reposition" on this link.	2015-11-13 03:35:55 +01:00
Laurent Destailleur	7d9fde803b	Merge pull request #3952 from atm-alexis/3.9_NEW_multityppeeventfilter NEW Develop multi type event filter	2015-11-13 02:27:53 +01:00
Laurent Destailleur	471bcdd29f	Remove hard coded list of permissions.	2015-11-13 02:21:27 +01:00
Laurent Destailleur	4065b3f1df	Better management of the Dolibarr tracking id into email. This will allow an imap scanner to link email	2015-11-13 00:19:11 +01:00
Laurent Destailleur	b2285ca5e0	Option MAIN_EMAIL_ADD_TRACK_ID is now set to 1 by default. All emails sent from Dolibarr have a dedicated tracking id.	2015-11-12 21:25:01 +01:00
arnaud	aaa6f00d11	FIX export propal and order with extrafields	2015-11-12 12:37:04 +01:00
Alexis Algoud	d997ac83e7	Add function param description	2015-11-12 09:08:08 +01:00
Alexis Algoud	a2c8c7c20e	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 3.9_NEW_multityppeeventfilter	2015-11-12 09:05:26 +01:00
aspangaro	30c4f1c896	HRM : language	2015-11-12 07:40:46 +01:00
aspangaro	bedba7ffb7	HRM: add a mode 'employee' for development to show tab	2015-11-12 07:26:51 +01:00
aspangaro	7693b407e8	HRM: Begin to work on employee card	2015-11-12 06:59:40 +01:00
aspangaro	20872498ba	HRM: Add a tab for holiday module in employee card	2015-11-12 06:58:26 +01:00
Laurent Destailleur	2bd0f04d8f	Add feature to get nb of top menu entrie Fix translation of units	2015-11-12 00:48:37 +01:00
Laurent Destailleur	1f4742b77b	Remove useles html generated code. More code comment.	2015-11-11 19:38:19 +01:00
frederic34	cd738ef483	Merge remote branch 'upstream/develop' into fccard Conflicts: htdocs/commande/card.php	2015-11-11 17:23:37 +01:00
frederic34	01d4bd6cf5	bad invert	2015-11-11 17:19:53 +01:00
Laurent Destailleur	e673b18871	Merge pull request #3949 from marcosgdf/bug-3865 FIX #3865 ajax_autocompleter triggers twice change() JS event over #search_htmlname	2015-11-11 15:36:34 +01:00
Laurent Destailleur	98c32fa1ec	FIX The label hidden was not supported when using jmobile	2015-11-10 00:36:33 +01:00
Alexis Algoud	99513ac9f3	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 3.9_NEW_multityppeeventfilter	2015-11-09 18:31:21 +01:00
frederic34	b8a84d68ec	add messages	2015-11-09 18:19:10 +01:00
Alexis Algoud	68cbd4699b	NEW multi event type for filter and get form in order to allow bookmark	2015-11-09 17:18:23 +01:00
Laurent Destailleur	71fa347e8e	FIX Better compatibility for users that used the not supported option MAIN_USE_JQUERY_MULTISELECT set to 1.	2015-11-08 18:40:12 +01:00
Marcos García de La Fuente	7ebe032d6f	FIX #3865 ajax_autocompleter triggers twice change() JS event over #search_htmlname Close #3865	2015-11-08 16:01:12 +01:00
Laurent Destailleur	6ec33a94c6	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-08 15:39:10 +01:00
Laurent Destailleur	bd56396394	Fix migration error	2015-11-08 15:38:57 +01:00
Laurent Destailleur	e6ab6bdb8e	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-11-08 14:38:01 +01:00
Laurent Destailleur	7a0206adce	FIX Missing to set context into workflow actions, so triggers can't know we are creating an invoice from order or an order from a proposal.	2015-11-08 14:37:50 +01:00
Juanjo Menent	59b3124d7d	Merge pull request #3938 from marcosgdf/fr-3876 NEW #3876 Renamed Product::isservice and Product::isproduct to match PSR-2	2015-11-08 11:20:36 +01:00
Juanjo Menent	509b45a0d0	Merge pull request #3936 from marcosgdf/bug-3931 FIX #3931 [Insight] Logical operators should be avoided - in htdocs/core/class/extrafields.class.php, line 261	2015-11-08 11:19:13 +01:00
Juanjo Menent	77284982d5	Merge pull request #3935 from marcosgdf/bug-3897 FIX #3897 Incorrect colspan in tr#tablelines > tr#trlinefordates	2015-11-08 11:18:29 +01:00
Laurent Destailleur	24dff1d842	NEW Statistic graphs on products offer a filter on product type (product / service or both)	2015-11-08 00:35:30 +01:00
Laurent Destailleur	3906cb79c5	NEW: Add parameter to add a link to use "date of invoice" in one click when fille a payment card.	2015-11-07 23:46:07 +01:00
Laurent Destailleur	4e64230ac9	NEW Add chart of product statistics	2015-11-07 16:25:14 +01:00
Laurent Destailleur	57e162d7f8	The component selectAjaxArray can return javascript part into a global "delayed" variable so caller can output it at end of page. This reduce the Flash Over Unstyle Content effect.	2015-11-07 15:46:06 +01:00
Marcos García de La Fuente	4a52d3c1b1	Removed unwanted change	2015-11-07 15:35:00 +01:00
Marcos García de La Fuente	84a152dc2e	FIX #3836 Unable to upload a document to an invoice under some circunstances	2015-11-07 15:33:48 +01:00
Marcos García de La Fuente	75b4cb4727	NEW #3876 Renamed Product::isservice and Product::isproduct to match PSR-2	2015-11-07 14:37:47 +01:00
Marcos García de La Fuente	0451cc1e73	FIX #3931 [Insight] Logical operators should be avoided - in htdocs/core/class/extrafields.class.php, line 261 Close #3931	2015-11-07 14:31:12 +01:00
Marcos García de La Fuente	8ccb8c92e0	FIX #3897 Incorrect colspan in tr#tablelines > tr#trlinefordates Close #3897	2015-11-07 14:29:38 +01:00
Laurent Destailleur	350ef610e9	Fix beluga pdf for projects. Add missing expense reports.	2015-11-07 12:36:34 +01:00
Laurent Destailleur	99f5211070	NEW Can use the * as a joker characters into search boxes of lists	2015-11-07 11:48:35 +01:00
Laurent Destailleur	b2d9f21253	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-06 18:57:46 +01:00
Laurent Destailleur	d0e6db7f89	Use the new banner for first tab of products.	2015-11-06 18:57:35 +01:00
Maxime Kohlhaas	dac0a7bc50	Fix : finally, autofocus on product search field is a bad idea	2015-11-06 11:09:54 +01:00
philippe grand	5f74a0f1c0	Traduction	2015-11-06 09:46:18 +01:00
Laurent Destailleur	0f358eea49	Fix path definition of thumbs with the new function	2015-11-06 01:56:56 +01:00
Laurent Destailleur	2dc644da30	Debug Direct print module using the OAuth setup.	2015-11-06 01:33:49 +01:00
Laurent Destailleur	04664c203d	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/comm/action/card.php htdocs/expedition/class/expedition.class.php htdocs/product/stock/product.php	2015-11-05 22:13:08 +01:00
Laurent Destailleur	58cac2d895	Merge remote-tracking branch 'origin/3.7' into 3.8 Conflicts: htdocs/comm/action/card.php htdocs/expedition/class/expedition.class.php htdocs/product/stock/product.php	2015-11-05 22:09:54 +01:00
Laurent Destailleur	fe78996026	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/commande/class/commande.class.php htdocs/product/stock/fiche.php htdocs/product/stock/valo.php	2015-11-05 22:04:18 +01:00
Laurent Destailleur	e4bd99aaf3	Merge pull request #3904 from frederic34/printgcp Google Cloud Print	2015-11-05 21:57:08 +01:00
Laurent Destailleur	a7cea65710	Merge pull request #3903 from atm-alexis/3.9_FIX_crabe_model_for_ISO_address_emplacement NEW add an option to use standard ISO location for bill in crabe model	2015-11-05 21:51:38 +01:00
Laurent Destailleur	64fb4a30bb	Merge pull request #3899 from grandoc/develop Typo	2015-11-05 21:46:33 +01:00
Laurent Destailleur	f3b8df3ea5	Merge pull request #3889 from frederic34/escpos Receipt Printer conf and lang	2015-11-05 21:32:43 +01:00
frederic34	55dfa4859f	Install lib with composer	2015-11-05 21:09:14 +01:00
frederic34	3ef6a92bb1	Google Cloud Print	2015-11-05 18:04:00 +01:00
frederic34	8a765bf5fd	wip	2015-11-05 16:20:35 +01:00
Alexis Algoud	8221817087	NEW add an option to use standard ISO location for bill in crabe model For electronic sending solutions, it could be required	2015-11-05 16:17:09 +01:00
Raphaël Doursenaud	b0cf9bd0be	Fix #3864 Really fixed invalid jQuery code	2015-11-05 14:38:11 +01:00
philippe grand	04238da75d	Typo	2015-11-05 14:16:13 +01:00
Laurent Destailleur	41ccfc411a	Better error message	2015-11-05 10:11:39 +01:00
frederic34	1a374ddd2c	Receipt Printer conf and lang	2015-11-05 08:42:03 +01:00
Laurent Destailleur	f319976e5d	FIX #3878 Storing and deleting files on emailing was done at wrong place Conflicts: htdocs/comm/mailing/card.php	2015-11-05 03:08:15 +01:00
Laurent Destailleur	a612289136	FIX Storing and deleting files on emailing was done at wrong place	2015-11-05 03:02:31 +01:00
Laurent Destailleur	1f4481a6b0	Merge pull request #3172 from atm-maxime/new_creditnote NEW Add hidden option INVOICE_CREDIT_NOTE_STANDALONE to allow to create credit note without invoice	2015-11-05 02:45:15 +01:00
Laurent Destailleur	11b7d8a44c	Merge pull request #3873 from frederic34/escpos Escpos Receipt printer	2015-11-05 02:18:09 +01:00
Laurent Destailleur	bd96d2f5b1	Merge pull request #3869 from atm-alexis/3.9_FIX_hook_for_PDF FIX all PDF hook must be in addreplace type	2015-11-05 02:16:49 +01:00
Laurent Destailleur	e26940ddf7	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/core/lib/admin.lib.php htdocs/core/modules/DolibarrModules.class.php htdocs/fourn/ajax/getSupplierPrices.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/install/filelist.xml htdocs/install/mysql/migration/3.8.0-3.9.0.sql htdocs/societe/price.php	2015-11-05 01:50:30 +01:00
Laurent Destailleur	f3421bcf6d	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2015-11-05 01:13:23 +01:00
Laurent Destailleur	77371af35a	FIX #3661 Margin is not selected correctly when adding a product	2015-11-05 01:08:30 +01:00
frederic34	644a104d5f	start to parse template	2015-11-04 23:14:50 +01:00
Raphaël Doursenaud	69ac75bef8	Fix #3864 Fixed invalid jQuery code	2015-11-04 22:55:14 +01:00
frederic34	ece9f68e0c	wip	2015-11-04 20:02:04 +01:00
Laurent Destailleur	09f3cd6f1d	Fix class cant be abstract	2015-11-04 16:43:24 +01:00
frederic34	4a67a94704	wip template edit	2015-11-03 23:11:04 +01:00
frederic34	5c725aceb8	sql	2015-11-03 22:12:03 +01:00
frederic34	d362d889f6	wip	2015-11-03 20:50:01 +01:00
Alexis Algoud	e3a42a78f2	FIX all PDF hook must be in addreplace type, not return value to work as expected	2015-11-03 15:14:42 +01:00
Laurent Destailleur	cd68ea9d0f	Fix: We must use external URL for OAuth.	2015-11-02 21:42:11 +01:00
Laurent Destailleur	1bcda200e3	A module to setup OAuth. OK, but what to do once setup of a client id/secret is done ?	2015-11-02 20:48:27 +01:00
Laurent Destailleur	563a020595	NEW Free text for cheque deposit receipt can be HTML content.	2015-11-02 20:35:33 +01:00
Laurent Destailleur	ffe1284a85	Merge pull request #3840 from frederic34/printgcp Printing with Google Cloud Print	2015-11-02 20:09:13 +01:00
Laurent Destailleur	b8ffa56497	Fix #3857	2015-11-02 19:49:00 +01:00
Laurent Destailleur	da0aa2f937	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/core/class/html.form.class.php htdocs/core/lib/pdf.lib.php htdocs/langs/en_US/main.lang htdocs/product/list.php htdocs/product/stock/mouvement.php	2015-11-02 19:31:42 +01:00
Laurent Destailleur	958c3851d7	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2015-11-02 19:17:32 +01:00
Laurent Destailleur	055fe5e275	FIX #3786 Translation of select box.	2015-11-02 19:17:22 +01:00
Laurent Destailleur	67a2f6ee91	Merge pull request #3854 from fmarcet/3.8 FIX: Send emails to contacts who should not receive emails	2015-11-02 18:03:59 +01:00
Laurent Destailleur	f928062e2b	FIX #3726 Better support for PRODUCT_USE_OLD_PATH_FOR_PHOTO	2015-11-02 17:56:32 +01:00
Laurent Destailleur	e12a38d584	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-02 15:44:57 +01:00
Laurent Destailleur	d0d4c5e7f8	NEW The conditional IF into ODT templates works also on not defined var so we can show data only if defined. Close #3819	2015-11-02 15:44:47 +01:00
Laurent Destailleur	c06c2d0464	FIX #3841 creation of a task completed has not status set to finished by default	2015-11-02 14:21:45 +01:00
Frédéric FRANCE	7b8a33adfe	Update commonobject.class.php	2015-11-02 13:20:51 +01:00
Laurent Destailleur	c119859696	NEW The quick search box on left menu can also search into expense reports.	2015-11-02 13:14:46 +01:00
fmarcet	3c5903f75a	FIX: Contacts are not added to the list with the status "no contact"	2015-11-02 11:52:58 +01:00
Laurent Destailleur	269fb87342	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8	2015-11-02 11:46:12 +01:00
Laurent Destailleur	20a1863866	FIX IF autocomplete was set on thirdparty list, it was not possible to open list of extrafields.	2015-11-02 11:45:59 +01:00
frederic34	9149032a03	Merge remote branch 'upstream/develop' into printgcp Conflicts: htdocs/core/actions_printing.inc.php	2015-11-02 11:43:34 +01:00
Laurent Destailleur	a9ddcc1a80	Merge pull request #3832 from frederic34/patch-16 NEW Add supplier order to the Direct Printing System	2015-11-02 11:27:00 +01:00
Laurent Destailleur	a14fee7296	Merge pull request #3852 from hregis/develop_origin FIX add Mac OS detection and show it into OS information of user popup	2015-11-02 11:26:20 +01:00
Laurent Destailleur	bc29898621	Merge pull request #3814 from FHenry/3.8 FIX : missing tag myuser_job into ODT replacement	2015-11-02 11:22:52 +01:00
Laurent Destailleur	200e4638f4	Merge pull request #3812 from fappels/develop-best-pmp-pos-margin Fix: #2591 Margin is incorrect used with POS	2015-11-02 11:06:20 +01:00
Laurent Destailleur	465ad6b3a7	Merge pull request #3802 from olsesacl/develop-hook hooks correctly implemented , printObjectLine, printObjectSubLine	2015-11-02 10:44:59 +01:00
Laurent Destailleur	37f01f995c	Merge pull request #3853 from aspangaro/develop-71 Salaries : Replace "label for" by the function fieldLabel & add some notes & correct typo	2015-11-02 10:42:19 +01:00
Laurent Destailleur	a161e6d47a	Continue debug of PRODUIT_MULTIPRICES option. Introduce option PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL to have relative caculation of multiprice not yet visible.	2015-11-02 10:09:09 +01:00
frederic34	3e752ed5c8	Typo	2015-11-02 09:46:21 +01:00
Laurent Destailleur	6fe43cbbeb	Removed dead code	2015-11-02 09:08:08 +01:00
Laurent Destailleur	3409686405	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-11-02 08:57:01 +01:00
aspangaro	ac47c2f22e	Merge remote-tracking branch 'Upstream/develop' into develop-71	2015-11-02 06:44:16 +01:00
aspangaro	6df524bcb0	Remove blank page	2015-11-01 22:54:04 +01:00
Regis Houssin	0fd7ba478a	Fix: add Mac OS	2015-11-01 17:27:41 +01:00
frederic34	b9367bb196	Errors management	2015-11-01 11:24:51 +01:00
frederic34	2b4224d4c4	List Jobs	2015-11-01 10:10:14 +01:00
frederic34	2f3e6958f9	Receipt Printer	2015-11-01 00:58:08 +01:00
frederic34	bb06a55844	Work on list jobs	2015-10-31 23:27:10 +01:00
frederic34	0836a84c0e	Somme cleaning	2015-10-31 18:06:49 +01:00
Marcos García de La Fuente	e1f2efee4d	Merge branch 'develop' into multiprice-generator # Conflicts: # htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2015-10-31 11:46:14 +01:00
Juanjo Menent	efb6e87f3f	Merge pull request #3839 from fmarcet/3.8 FIX Bad parameter on calling get_exdir function	2015-10-30 22:13:36 +01:00
Laurent Destailleur	6482a4ee04	Minor css fix	2015-10-30 20:04:03 +01:00
Laurent Destailleur	a8d28b5e46	NEW Add a filter field to restrict list of member when doing a LDAP list request. Use also this filter into ldap command line script making sync from ldap to dolibarr.	2015-10-30 19:23:23 +01:00
frederic34	b6be372c4b	Merge remote branch 'upstream/develop' into printgcp	2015-10-30 18:12:34 +01:00
frederic34	e90f68906e	SQL tables for oauth	2015-10-30 17:59:45 +01:00
frederic34	1694c690ed	Printing with Google Cloud Print	2015-10-30 17:22:06 +01:00
Ferran Marcet	5862037d34	FIX Bad parameters	2015-10-30 13:03:34 +01:00
Laurent Destailleur	2c682022cf	NEW The search box and the bookmarks are now rendered by the menu manager.	2015-10-30 09:36:57 +01:00
Laurent Destailleur	6cc3df7e71	NEW Quick searh filter works on invoice, proposal, order, intervention, contract	2015-10-30 08:35:56 +01:00
Laurent Destailleur	3760f247a2	NEW Can now select fields to show in product list. Extrafields are also supported.	2015-10-30 00:05:00 +01:00
Frédéric FRANCE	b1c4e032fc	Update html.formfile.class.php	2015-10-29 19:08:38 +01:00
Frédéric FRANCE	e5063010b2	Update actions_printing.inc.php	2015-10-29 19:07:00 +01:00
Juanjo Menent	c14349f1ea	Merge pull request #3829 from hregis/3.8_bug Fix: add missing hooks	2015-10-29 16:05:35 +01:00
Regis Houssin	6373c82559	Fix: broken features !!!	2015-10-29 13:14:38 +01:00
fmarcet	310ecb1e09	FIX: Show product image on getNomUrl()	2015-10-29 12:28:28 +01:00
Regis Houssin	e5b1e214bc	Fix: add missing hooks	2015-10-29 11:50:16 +01:00
fmarcet	62dc6814a3	FIX #3726 Not showing images on product card	2015-10-29 10:14:54 +01:00
Florian HENRY	9a95401473	FIX : add tag myuser_job into ODT replacement	2015-10-28 11:27:39 +01:00
Laurent Destailleur	87c240252c	FIX Can export a field into task time table with export project profile	2015-10-27 22:24:18 +01:00
Laurent Destailleur	76ded0acea	Fix using DATE_FORMAT is forbidden	2015-10-27 19:26:33 +01:00
fappels	8992cfaeb4	move require_once	2015-10-27 15:50:55 +01:00
Marcos García de La Fuente	eff1f73950	Merge branch 'develop' into multiprice-generator # Conflicts: # htdocs/install/mysql/migration/3.8.0-3.9.0.sql # htdocs/product/price.php	2015-10-27 10:41:50 +01:00
Sergio Sanchis Climent	b1bc000bae	standardize	2015-10-27 09:19:39 +01:00
Laurent Destailleur	4f04775b41	Merge pull request #3800 from olsesacl/develop error this.price > 0 always false	2015-10-26 22:40:26 +01:00
fappels	4d839eea60	Fix #2591 Margin is incorrect used with POS if buy price not defined, define buyprice as configured in margin admin. If 'Force buying price if null' is off, marge will be equal to suggested default.(min supplier price or pmp) Updated all classes reading 'Force buying price if null' setting.	2015-10-26 20:33:42 +01:00
Laurent Destailleur	6493438e87	NEW The clicktodial module is now able to provide link "tel:" on phone numbers. So it is also possible to use clicktodial with a client solution like the "xivo" local client.	2015-10-26 16:20:09 +01:00
Sergio Sanchis Climent	990fbf3ef4	hooks correctly implemented , printObjectLine, printObjectSubLine In hook can change correctly label and ref (for my module need if is posible)	2015-10-26 14:00:43 +01:00
Laurent Destailleur	5c4ac0bf62	NEW Merge all left menu search boxes into one.	2015-10-26 12:18:22 +01:00
Sergio Sanchis Climent	2696369470	Merge remote-tracking branch 'upstream/develop' into develop	2015-10-26 11:38:52 +01:00
Sergio Sanchis Climent	4fd0086862	Fix: error this.price > 0 if no parse this.price when compare this.price and 0 always false	2015-10-26 11:33:43 +01:00
Laurent Destailleur	71da059ef0	NEW Add a new widget $form->selectArrayAjax() to use combo list with content coming from an Ajax URL.	2015-10-26 11:23:31 +01:00
Maxime Kohlhaas	bd831b1f24	Merge branch 'new_creditnote' of github.com:atm-maxime/dolibarr into new_creditnote	2015-10-26 09:40:50 +01:00
Laurent Destailleur	77a0359cfc	Fix bad test	2015-10-25 20:17:43 +01:00
Laurent Destailleur	9a4b62c279	NEW Introduce use of cache for thumbs images of users	2015-10-25 20:15:52 +01:00
Laurent Destailleur	1f1e72f2b6	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/compta/facture/list.php htdocs/core/class/html.form.class.php htdocs/core/lib/functions.lib.php htdocs/filefunc.inc.php htdocs/fourn/facture/list.php htdocs/main.inc.php	2015-10-25 19:54:41 +01:00
Laurent Destailleur	4e206fa80b	Fix doxygen	2015-10-25 19:53:59 +01:00
Laurent Destailleur	d7761ece58	FIX The thumb of user into top menu was using the image in full size. This make a large download at each page call. We must use the mini thumbs.	2015-10-25 19:42:54 +01:00
Laurent Destailleur	48ed8d4408	FIX The thumb of user into top menu was using the image in full size. This make a large download at each page call. We must use the mini thumbs.	2015-10-25 19:42:00 +01:00
Laurent Destailleur	b49d63c12f	NEW Show photo of user into user list. A new function getImageFileNameForSize was also introduced to choose image best size according to usage to save bandwith.	2015-10-25 19:31:42 +01:00
Laurent Destailleur	1b8234d9fe	Bette behaviour for blind people	2015-10-25 11:09:50 +01:00
Laurent Destailleur	461771d488	Currency is on title only.	2015-10-24 21:20:32 +02:00
Laurent Destailleur	3015a0388a	NEW List of projects of a thirdparty are visible on a project tab	2015-10-24 16:09:26 +02:00
Laurent Destailleur	a01a85c3f6	FIX tag object_total_vat_x need x to be a string with unknown decimal lenght. Now use for x the real vat real with no more decimal (x = 20 or x = 8.5 or x = 5.99, ...)	2015-10-23 15:13:02 +02:00
Laurent Destailleur	f6d30d8b9e	Fix: W3C no form into table	2015-10-23 14:40:45 +02:00
Laurent Destailleur	8d24adc97e	Remove 2 other duplicated pages. There is only one page now for all list of thirdarties (with a parameter type to have it specialized per customer, prospect or supplier profile).	2015-10-23 13:52:51 +02:00
Laurent Destailleur	90a221ef6d	Fix version of module	2015-10-22 19:46:30 +02:00
Laurent Destailleur	633055fe5b	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-10-22 19:44:00 +02:00
Laurent Destailleur	8df59134a9	Merge pull request #3705 from aspangaro/develop-hrm New : Module HRM	2015-10-22 19:15:49 +02:00
Laurent Destailleur	531ef43a27	Some minor look fixes.	2015-10-22 19:13:16 +02:00
Laurent Destailleur	cac4a85ccd	Merge pull request #3788 from atm-maxime/new_customer_recap New customer recap	2015-10-22 18:02:38 +02:00
Laurent Destailleur	9f21ea58a3	A lot hooks used into PDF generation were not correctly implemented. We had to fix this. The result si that the following hook were set as hook of type "replace". This means if your module implement such hooks, it must return 0 to execute standard code or 1 to replace standard code (value to output should be set into resPrints instead).	2015-10-22 17:51:05 +02:00
Laurent Destailleur	2615e02e1e	Update doc	2015-10-22 13:18:51 +02:00
Laurent Destailleur	9cce56895c	Merge branch 'patch-77' of https://github.com/defrance/dolibarr into defrance-patch-77 Conflicts: htdocs/core/lib/admin.lib.php	2015-10-22 13:13:02 +02:00
Laurent Destailleur	ce681081c1	Merge pull request #3776 from frederic34/patch-15 Set warehouse for order	2015-10-22 12:16:40 +02:00
frederic34	865e9d9738	Merge remote branch 'upstream/develop' into patch-15 Conflicts: htdocs/langs/en_US/admin.lang	2015-10-22 10:28:06 +02:00
Laurent Destailleur	8bdbed69c9	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-10-22 10:22:54 +02:00
Laurent Destailleur	81d4148f4a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-10-22 09:50:26 +02:00
Laurent Destailleur	474692e71a	Remove duplicate page fourn/list.php	2015-10-22 09:48:16 +02:00
Laurent Destailleur	7daf9d10af	Work on the new selectArrayAjax widget	2015-10-21 20:50:27 +02:00
Laurent Destailleur	fd72b4a400	Work on the new selectArrayAjax widget	2015-10-21 20:43:11 +02:00
BENKE Charlie	ec9955986f	Update admin.lib.php	2015-10-21 05:07:13 +02:00
BENKE Charlie	4f519b5747	Update admin.lib.php	2015-10-21 05:06:19 +02:00
Laurent Destailleur	8306d93286	NEW Add css on column of detail lines to allow module to easily manipulate fields.	2015-10-20 16:08:25 +02:00
Laurent Destailleur	f123e11c8e	Doxygen	2015-10-20 12:53:32 +02:00
Laurent Destailleur	0c6441df74	FIX Using extrafield with type "Link to object" works correctly.	2015-10-20 12:40:37 +02:00
Laurent Destailleur	22979523db	Try a fix for #3742	2015-10-20 02:34:53 +02:00
Laurent Destailleur	b5e633ef42	Size too small	2015-10-20 00:52:53 +02:00
Laurent Destailleur	e70bb28be7	If firstname not define, use lastname	2015-10-20 00:47:35 +02:00
Laurent Destailleur	23d7d60d73	Better compatibility with old versions	2015-10-20 00:22:28 +02:00
Frédéric FRANCE	affe067ff1	Update commonobject.class.php	2015-10-19 21:09:02 +02:00
Maxime Kohlhaas	158281b14c	Fix : minor typo	2015-10-19 17:13:02 +02:00
Marcos García de La Fuente	e7e152c122	NEW Level multiprice generator based on per cent variations over base price	2015-10-19 15:13:19 +02:00
Laurent Destailleur	bbbd5f5202	Fix removed var_dump	2015-10-19 14:55:01 +02:00
Laurent Destailleur	d71ccc4a02	NEW The free text in PDF footer can now be a HTML content. So the WYSIWYG editor is on by default to edit it into module setup.	2015-10-19 14:39:55 +02:00
Laurent Destailleur	18725b554b	Option MAIN_REPLACE_TRANS_xx_XX is now completely implemented.	2015-10-19 13:23:45 +02:00
Laurent Destailleur	fd3ba13130	FIX #3541 Bypass authentication when user was created using LDAP	2015-10-18 21:33:47 +02:00
Frédéric FRANCE	6f4cfc86e8	Update notify.class.php http://www.dolibarr.fr/forum/12-howto--aide/54061-probleme-sur-la-validation-des-commande-fournisseu Fatal error: Call to a member function getFullName() on a non-object in /home/xxxx/public_html/xxxxx/htdocs/core/class/notify.class.php on line 374	2015-10-18 11:25:55 +02:00
philippe grand	f31ddc23aa	[Qual] Uniformize code	2015-10-17 16:18:33 +02:00
aspangaro	aac88519de	Merge remote-tracking branch 'Upstream/develop' into develop-hrm Conflicts: htdocs/user/card.php	2015-10-17 07:19:46 +02:00
Laurent Destailleur	3ce147ccc1	Use new architecture for quick search for the account area.	2015-10-17 02:41:09 +02:00
Laurent Destailleur	8c66a7d099	Revert a bad PR. if form_confirm is replaced with formconfirm, we must include a print before. It is no more included into function.	2015-10-17 02:01:13 +02:00
Laurent Destailleur	7fd6d8839a	Uniformize code and use a new generic search architecture	2015-10-17 01:40:46 +02:00
Laurent Destailleur	d1d6c72d7d	NEW Uniformize way of working for search filters. One filter per object.	2015-10-16 22:21:26 +02:00
Laurent Destailleur	87c12717a7	NEW The thirdparties tabs, the contacts tabs and the members tabs are now presented using a new top banner, saving space and using a same way to show address, status and navigation arrows.	2015-10-16 20:16:28 +02:00
Laurent Destailleur	df0c6aa5cf	Use the new card banner for members	2015-10-16 16:14:33 +02:00
Laurent Destailleur	dc5cc52395	NEW Merge all search fields of an area page into one search box	2015-10-16 10:52:49 +02:00
Laurent Destailleur	b3491ef4e5	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: ChangeLog htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/admin/facture_cust_extrafields.php htdocs/compta/facture/admin/facturedet_cust_extrafields.php htdocs/compta/facture/class/facture.class.php htdocs/contrat/card.php	2015-10-16 10:12:36 +02:00
Laurent Destailleur	8a02c8288b	Merge remote-tracking branch 'origin/3.7' into 3.8 Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/product/index.php	2015-10-16 09:56:55 +02:00
Laurent Destailleur	9b85a70013	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: ChangeLog htdocs/comm/propal.php htdocs/comm/propal/class/propal.class.php	2015-10-16 09:52:38 +02:00
Laurent Destailleur	b43047bc2f	Use the new banner on all tabs of contacts	2015-10-15 14:13:31 +02:00
Laurent Destailleur	8a32041f16	Clean CSS when option MAIN_MAXTABS_IN_CARD is set	2015-10-15 13:31:44 +02:00
Laurent Destailleur	7f75a3da9d	NEW On list of thirdparties, user can select fields to show. Make phpunit test working again localy. Add missing columns into llx_expedition.	2015-10-15 03:29:35 +02:00
Laurent Destailleur	00c8b27baf	Add code comment	2015-10-14 22:04:54 +02:00
Laurent Destailleur	e9aed15bed	Work on the feature to select which field to show	2015-10-14 18:48:03 +02:00
Florian HENRY	00b610d87f	FIX : fix HTML into formconfirm box	2015-10-14 08:23:52 +02:00
Laurent Destailleur	57ea4fc23d	FIX sql syntax error when sort order not defined.	2015-10-13 14:40:02 +02:00
Laurent Destailleur	6520ed7a08	Use css not bold title. Add missing badge (count of draft records) on draft list.	2015-10-13 14:09:14 +02:00
Laurent Destailleur	9f0c0bfc92	NEW Introduce hidden option MAIN_REPLACE_TRANS_xx_XX to allow simple replacement of translated string on the fly.	2015-10-13 13:27:44 +02:00
Laurent Destailleur	a84ec64ece	The new banner tab is available on all tabs of thirdparty.	2015-10-13 13:06:32 +02:00
Laurent Destailleur	918d9b7c18	Fix filter was lost if nothing found	2015-10-13 12:05:24 +02:00
aspangaro	0b54cc4509	Merge remote-tracking branch 'Upstream/develop' into develop-hrm	2015-10-11 21:05:15 +02:00
Laurent Destailleur	618e5f0419	FIX no need to remove file into mail form #3573	2015-10-11 20:47:31 +02:00
Laurent Destailleur	87fad70f4a	Revert "FIX no need to remove file into mail form"	2015-10-11 20:42:49 +02:00
Laurent Destailleur	62dd936b08	Merge pull request #3573 from atm-alexis/FIX_remove_file_from_mail_remove_file FIX no need to remove file into mail form	2015-10-11 20:42:42 +02:00
Laurent Destailleur	80bd563fde	Use GETPOST	2015-10-11 20:41:06 +02:00
Laurent Destailleur	5b715c29e2	Merge pull request #3717 from marcosgdf/bug-3197 FIX [ bug #3197 ] Trigger LINECONTRACT_CREATE does not follow common denomination	2015-10-11 20:30:33 +02:00
Laurent Destailleur	9a6ac4f457	CSS enhancement	2015-10-11 16:32:46 +02:00
Laurent Destailleur	7fae9450a3	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-10-11 15:21:45 +02:00
Laurent Destailleur	bd48ad265d	The new banner tab is also on user card now	2015-10-11 15:21:21 +02:00
Laurent Destailleur	0ba6bdb7c2	CSS enhancement	2015-10-11 13:26:22 +02:00
Marcos García de La Fuente	8cd17c0165	FIX [ bug #3197 ] Trigger LINECONTRACT_CREATE does not follow common denomination Close #3197	2015-10-11 13:01:28 +02:00
Marcos García de La Fuente	4e9a378f0d	Merge branch '3.6' into bug-1776	2015-10-11 12:37:41 +02:00
Laurent Destailleur	db9d09c7a3	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-10-11 12:28:03 +02:00
Laurent Destailleur	6ec77e2ca0	New banner card on contact card.	2015-10-11 12:27:04 +02:00
Laurent Destailleur	7b7d27920d	Merge remote-tracking branch 'origin/3.7' into 3.8 Conflicts: htdocs/adherents/type.php htdocs/categories/class/categorie.class.php htdocs/core/class/commonobject.class.php htdocs/core/class/extrafields.class.php htdocs/core/lib/tax.lib.php htdocs/product/composition/card.php	2015-10-10 18:56:28 +02:00
Laurent Destailleur	525f9841fa	Fix doxygen	2015-10-10 18:38:22 +02:00
Laurent Destailleur	fb50daaa40	Fix bad parameter	2015-10-10 16:09:01 +02:00
Laurent Destailleur	0222867a94	The new banner for tab is moved into a shared functions	2015-10-10 12:01:09 +02:00
aspangaro	8e37da55c3	Add searchform, language key and correct code	2015-10-10 08:34:15 +02:00
aspangaro	8f8de587b8	Add admin & first version to manage establishment	2015-10-10 06:39:59 +02:00
aspangaro	cd7c5645c7	Add library	2015-10-10 06:38:42 +02:00
aspangaro	5d7e05e313	Correct review	2015-10-10 06:00:55 +02:00
aspangaro	f6947afc2f	Merge remote-tracking branch 'Upstream/develop' into develop-hrm	2015-10-10 05:42:06 +02:00
Laurent Destailleur	f4f7629037	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/html.form.class.php	2015-10-10 02:10:14 +02:00
Laurent Destailleur	effba68511	Start to work on a common banner for tabs (goal is to have a nicer and generic part for all element)	2015-10-10 01:51:12 +02:00
Laurent Destailleur	279e7028fb	Merge pull request #3686 from grandoc/3.7 3.7	2015-10-09 20:38:16 +02:00
Laurent Destailleur	f9485bd25b	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/core/class/extrafields.class.php	2015-10-09 20:35:17 +02:00
Laurent Destailleur	b27989d5d4	Merge pull request #3665 from altatof/fix_extrafields reenable search criteria in sql clause	2015-10-09 20:32:42 +02:00
Laurent Destailleur	ab4b423567	Merge pull request #3712 from GPCsolutions/fixunittests Fix unittests regression	2015-10-09 20:19:21 +02:00
Laurent Destailleur	796a87e254	Merge pull request #3673 from apachler/develop Changes to ODT creation of proposal and invoice	2015-10-09 20:18:55 +02:00
Raphaël Doursenaud	b785db86a8	Fix unittests regression Introduced by incomplete renaming of modSyncSupplierWebServices to modWebServicesClient in `4b103ba8ce`	2015-10-09 19:02:44 +02:00
Laurent Destailleur	f29c03c922	Start to work on a multiselect component to select which fields to show into dolibarr lists.	2015-10-09 16:35:14 +02:00
Laurent Destailleur	82428fea68	NEW: Only arrow of current sorted field is visible into table views. This save a lot of spaces. You can click on the column title to sort. This make clickable area larger and click to sort is easier.	2015-10-09 13:01:50 +02:00
aspangaro	d9693ba2f2	New : Module HRM	2015-10-09 06:16:43 +02:00
Laurent Destailleur	2fc11a289e	When there is no contact, no need to show filters	2015-10-09 00:30:02 +02:00
Laurent Destailleur	2b17cd3353	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-10-08 23:50:24 +02:00
Laurent Destailleur	0d799402d0	Work on image for "no photo" with better resolution	2015-10-08 23:50:17 +02:00
Florian HENRY	1f2a86078a	FIX : Always use type send in parameters in showCategories method	2015-10-08 11:03:08 +02:00
philippe grand	0e343ae3b2	syntax error	2015-10-08 09:34:02 +02:00
Laurent Destailleur	4b103ba8ce	Work on a better way to manage modules. All one page. Introduce a way to choose order of modules family. We should also be able to introduce filters.	2015-10-07 08:13:23 +02:00
Laurent Destailleur	8d47a307bb	Better use of space	2015-10-06 21:52:42 +02:00
Laurent Destailleur	6ea05aa311	FIX Bad translation key for project "Overview"	2015-10-06 16:03:47 +02:00
Laurent Destailleur	d92604f646	FIX Link of project must be cickable if user has permission to read all projects FIX Missing information into the alt of project picto	2015-10-06 00:46:26 +02:00
Raphaël Doursenaud	3fdd59bf0a	Fix #3666 checkbox extrafields on edit	2015-10-05 20:39:14 +02:00
Raphaël Doursenaud	41354ca00d	Added type hinting to extrafields object	2015-10-05 20:30:55 +02:00
Raphaël Doursenaud	d24f5538f9	Fix: wrong parameters order	2015-10-05 20:25:55 +02:00
Laurent Destailleur	e3f225e038	FIX bad link into project box	2015-10-05 19:41:41 +02:00
Andreas, OE8APR	3aeeab9654	Get proposal customer contact Added functionality to get proposal customer contact as contact_xx tags	2015-10-05 17:51:26 +02:00
Andreas, OE8APR	e3bdc8aaaa	Get invoice customer contact Added functionality to get invoice customer contact as contact_xx tags	2015-10-05 17:50:56 +02:00
Christophe Battarel	bf262c2cae	reenable search criteria in sql clause	2015-10-05 15:41:28 +02:00
Laurent Destailleur	143c1e03f8	FIX Missing menu entry for list of thirdparties when using auguria menu manager	2015-10-05 10:30:49 +02:00
Laurent Destailleur	68d4a9fc63	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/societe/list.php	2015-10-04 20:57:00 +02:00
Laurent Destailleur	17416dba89	Merge pull request #3651 from frederic34/patch-20 Add badge for number of files in bank's tab	2015-10-04 20:03:41 +02:00
Frédéric FRANCE	780a5a1996	Update files.lib.php	2015-10-04 19:59:26 +02:00
Laurent Destailleur	85a5b0fc69	Merge pull request #3652 from grandoc/develop FIX : typo	2015-10-04 19:57:12 +02:00
Laurent Destailleur	77218194c6	Merge pull request #3657 from frederic34/patch-16 Fix: #3552	2015-10-04 19:56:22 +02:00
frederic34	7f86797f73	Add contact photo	2015-10-04 17:25:46 +02:00
Laurent Destailleur	75e337e8d9	FIX select of project using ajax autocomplete option	2015-10-04 16:02:50 +02:00
Frédéric FRANCE	6f513fabef	Update DolibarrModules.class.php	2015-10-03 23:45:25 +02:00
Juanjo Menent	9d60dee781	Issue #3509 : Ready for customers	2015-10-03 17:15:25 +02:00
Juanjo Menent	03a2fd740d	Issue #3509 : Ready for customers	2015-10-03 16:58:46 +02:00
philippe grand	322928fbae	Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop	2015-10-03 16:33:16 +02:00
Juanjo Menent	92f4c0d015	Merge remote-tracking branch 'upstream/develop' into dolibarr-3509	2015-10-03 16:01:24 +02:00
Juanjo Menent	5d10fc2c77	Merge pull request #3644 from frederic34/patch-14 can't access documents for bank	2015-10-03 15:57:58 +02:00
philippe grand	298fafd7d2	fix : internationalization	2015-10-03 15:10:53 +02:00
philippe grand	b6de2a954c	fix : internationalization	2015-10-03 15:04:03 +02:00
Juanjo Menent	67d28d6991	Merge remote-tracking branch 'upstream/develop' into dolibarr-3509 Conflicts: htdocs/install/mysql/migration/3.8.0-3.9.0.sql	2015-10-03 14:59:56 +02:00
philippe grand	82c7022e20	Fix : internationalization	2015-10-03 14:47:11 +02:00
Laurent Destailleur	c0c0cc2415	Merge remote-tracking branch 'origin/3.8' into develop Conflicts: htdocs/compta/facture/list.php htdocs/langs/fr_FR/admin.lang htdocs/langs/fr_FR/interventions.lang htdocs/theme/md_exp/style.css.php	2015-10-03 14:28:31 +02:00
Frédéric FRANCE	7da49a3592	Add badge for number of files in bank's tab	2015-10-03 12:09:42 +02:00

... 17 18 19 20 21 ...

10096 Commits