dolibarr

Author	SHA1	Message	Date
Francis Appels	701c85620b	Extend sticker classes from abstract class Extend member and printsheet sticker printer classes from new abstract commonsticker generator	2015-05-03 10:00:11 +02:00
Francis Appels	2fd4bf1012	Add commonstickergenerator class Common abstract class for sticker printing. Creates contracts for write_file and addSticker methods	2015-05-03 09:54:37 +02:00
aspangaro	6dfd125872	Spaces 4 : Stop Shouting !	2015-05-03 06:25:50 +02:00
aspangaro	7062dc7b2e	Spaces 3 : the darkside	2015-05-03 06:20:34 +02:00
aspangaro	3a5f6db571	Spaces 2 : return of the vilains	2015-05-03 06:18:21 +02:00
aspangaro	9aa336e0d0	Spaces !!!	2015-05-03 06:16:28 +02:00
aspangaro	8163563753	New: Add option to show long or short (by default) label in select_month()	2015-05-03 06:12:02 +02:00
aspangaro	315e9239ac	Merge remote-tracking branch 'Upstream/develop' into develop-accountancy2	2015-05-02 06:45:53 +02:00
aspangaro	1174c67b07	Accountancy - Add key language & prepare journal for expense report	2015-05-02 06:42:06 +02:00
Juanjo Menent	6f6ff6697a	Merge pull request #2742 from aspangaro/develop-ER_badge New: ER add badge on tab document	2015-05-01 16:24:47 +02:00
Raphaël Doursenaud	31a8e38d37	Allow exporting projects without a third party FIX #2729 Conflicts: htdocs/core/modules/modProjet.class.php	2015-05-01 16:01:57 +02:00
Raphaël Doursenaud	93937fe7f3	Allow exporting projects without a third party FIX #2729	2015-05-01 15:58:36 +02:00
Raphaël Doursenaud	a6b0f6cfac	Allow exporting projects without a third party FIX #2729	2015-05-01 15:56:39 +02:00
aspangaro	b0eee2976c	New: ER add badge on tab document	2015-05-01 08:46:37 +02:00
Juanjo Menent	29c9686b8e	Merge pull request #2730 from GPCsolutions/dolibarr-2718 Export task labels	2015-04-30 21:02:17 +02:00
Juanjo Menent	4a4630a4a3	Merge pull request #2735 from GPCsolutions/dolibarr-2632 Add sensible default mode to directory creation	2015-04-30 20:51:37 +02:00
Juanjo Menent	91767edd05	Fixed SQL table reference for members types in export	2015-04-30 20:50:05 +02:00
Raphaël Doursenaud	afc582a369	Fixed SQL table reference for members types in export FIX #2712	2015-04-30 17:20:53 +02:00
Francis Appels	f762d6d7cb	Add tcpdfbarcode Add modTcpdfbarcode class Add pdf_label class pdf_standardlabel extends pdf_label	2015-04-30 16:41:52 +02:00
Raphaël Doursenaud	2c44aa6742	Add sensible default mode to directory creation Fix #2632	2015-04-30 16:22:01 +02:00
Raphaël Doursenaud	f1032baaab	Allow exporting projects without a third party FIX #2729	2015-04-30 11:48:32 +02:00
Raphaël Doursenaud	2058d21da9	Export task labels FIX #2718	2015-04-30 11:43:42 +02:00
Laurent Destailleur	6b3c060d9c	Fix doxygen	2015-04-30 00:07:30 +02:00
Laurent Destailleur	060d8a1a38	FIX Ref/label of product on contract line was not visible, nor into page, nor into PDF.	2015-04-29 19:57:01 +02:00
Laurent Destailleur	f9a428d550	Fixed #2714	2015-04-27 20:25:02 +02:00
Laurent Destailleur	92f2c48475	Fixed #2714	2015-04-27 11:46:08 +02:00
Laurent Destailleur	4e04f75c66	Fix css	2015-04-27 02:33:44 +02:00
Laurent Destailleur	1e237defb0	Fix phpcs	2015-04-26 17:59:02 +02:00
Laurent Destailleur	4235d74aac	Fix tests for ES	2015-04-26 16:45:24 +02:00
Laurent Destailleur	414404e854	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/comm/action/class/actioncomm.class.php htdocs/core/class/commonobject.class.php	2015-04-26 16:30:33 +02:00
Laurent Destailleur	7c706ebaf6	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-25 23:15:55 +02:00
Laurent Destailleur	60a56da370	Some change into css. Tabs background are now white so main content is black on white (better contrast). Fix editfieldval for date.	2015-04-25 22:20:10 +02:00
Laurent Destailleur	5a509940f3	Merge pull request #2706 from GPCsolutions/mobiledetect Mobiledetect	2015-04-24 21:22:56 +02:00
Laurent Destailleur	a091158cce	Merge pull request #2690 from open-minds/develop Add sorting for extra fields values	2015-04-24 21:10:27 +02:00
Laurent Destailleur	e0d2c43086	fix phpcs	2015-04-24 01:15:29 +02:00
Raphaël Doursenaud	7281ea21e6	Qual: moved mobiledetect external library External libraries resides in the include directory	2015-04-23 20:30:33 +02:00
Laurent Destailleur	4f3fe82e93	NEW Add filter on task ref and task label into list of tasks	2015-04-23 15:22:50 +02:00
Laurent Destailleur	7fd2247297	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-23 13:45:02 +02:00
Laurent Destailleur	f9285d6d23	NEW Can add all user of a project as user of a task, in one step.	2015-04-23 13:44:45 +02:00
Juanjo Menent	f7ab53be8e	Fix test for es. Dumps 3.5 et 3.6	2015-04-22 23:40:43 +02:00
Juanjo Menent	1ed573f98b	Fix: #2694 Bug: Warning: Invalid argument supplied for foreach() in commande.class.php on line 852	2015-04-22 23:31:24 +02:00
Laurent Destailleur	305030ae6c	Fix test to match new field names of note	2015-04-22 21:58:12 +02:00
Laurent Destailleur	807824aaad	Fix warnings	2015-04-22 21:48:59 +02:00
Laurent Destailleur	7f5377d219	Fix #2695	2015-04-22 19:25:20 +02:00
Laurent Destailleur	b57d3ddf03	Merge pull request #2695 from Ankapi/develop Fixed hook "pdfgeneration" in the pdf blochet of cheque deposit	2015-04-22 19:24:40 +02:00
Laurent Destailleur	100fa1067e	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/compta/bank/virement.php htdocs/compta/facture/impayees.php htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/core/menus/standard/eldy.lib.php htdocs/core/modules/modProjet.class.php htdocs/install/mysql/migration/3.6.0-3.7.0.sql htdocs/langs/en_GB/admin.lang htdocs/langs/es_AR/orders.lang htdocs/langs/es_AR/trips.lang htdocs/langs/es_CO/admin.lang htdocs/langs/es_CO/orders.lang htdocs/langs/es_CO/trips.lang htdocs/langs/fr_FR/admin.lang htdocs/langs/fr_FR/main.lang htdocs/langs/pl_PL/interventions.lang htdocs/langs/pt_BR/trips.lang htdocs/langs/ro_RO/productbatch.lang htdocs/langs/ro_RO/trips.lang htdocs/main.inc.php htdocs/projet/element.php	2015-04-22 17:57:57 +02:00
Laurent Destailleur	208ac31bf8	Fix test for es	2015-04-22 17:39:09 +02:00
David Avigni (Ankapi)	e298bd0a68	Fixed hook "pdf generation", executeHooks misnamed: replacement "adterPDFCreation" with "afterPDFCreation"	2015-04-22 15:23:52 +02:00
Laurent Léonard	e0cc007487	Add sorting for extra fields values	2015-04-21 20:21:24 +02:00
Laurent Destailleur	bce952fa9b	Fix bad link	2015-04-21 17:06:13 +02:00
Laurent Destailleur	96a33bbe8a	First clean of code after devcamp	2015-04-21 15:49:58 +02:00
Laurent Destailleur	1c8e1638c7	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-21 12:08:56 +02:00
Laurent Destailleur	a690276060	Fix js warnings, select2 css was not loaded.	2015-04-21 12:08:36 +02:00
Laurent Destailleur	e476b57795	Merge pull request #2678 from defrance69/patch-60 add tab management on salarie payement	2015-04-21 11:15:20 +02:00
Laurent Destailleur	9d1c609c4f	Merge pull request #2538 from marcosgdf/units NEW [ task 977 ] New option to manage product unit Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements	2015-04-21 11:14:50 +02:00
jfefe	f2d05ce754	Add missing value for object line type (product or service)	2015-04-20 16:20:04 +02:00
Laurent Destailleur	94589b9935	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-19 23:15:39 +02:00
Laurent Destailleur	65dafeee55	Uniformize feature between invoice and merging tool	2015-04-19 23:15:24 +02:00
Marcos García de La Fuente	2967bc7df7	Merge branch 'develop' into units	2015-04-19 17:19:59 +02:00
Marcos García de La Fuente	7be7a770c1	Implemented units for CommandeFournisseur and FactureFournisseur	2015-04-19 16:46:24 +02:00
BENKE Charlie	5a68cba013	Create salaries.lib.php add lib salaries for menu management	2015-04-19 13:25:43 +02:00
Raphaël Doursenaud	e7a21de11d	Use minified select2 js lib	2015-04-19 12:58:47 +02:00
Juanjo Menent	9efdc09c32	Merge pull request #2674 from atm-maxime/develop Fix : multi upload of files in document tabs	2015-04-19 10:03:27 +02:00
Maxime Kohlhaas	e692950627	Fix : multi upload of files in document tabs	2015-04-19 04:04:43 +02:00
jfefe	f5db4d5bb7	Fix: missing getEntity function	2015-04-19 03:05:37 +02:00
Laurent Destailleur	111b54d82c	Fix phpcs	2015-04-19 03:02:49 +02:00
Marcos García de La Fuente	270bca740c	Merge branch 'develop' into units Conflicts: htdocs/compta/facture/fiche-rec.php	2015-04-19 00:59:04 +02:00
Marcos García de La Fuente	15b1f03a08	Merge branch 'develop' into commercial-name Conflicts: htdocs/comm/list.php htdocs/comm/prospect/list.php htdocs/societe/consumption.php htdocs/societe/soc.php	2015-04-19 00:48:07 +02:00
Maxime Kohlhaas	ee8b5be43b	Typo	2015-04-19 00:46:30 +02:00
Laurent Destailleur	5b29c87933	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/compta/deplacement/fiche.php htdocs/core/tpl/objectline_create.tpl.php htdocs/expedition/fiche.php	2015-04-19 00:23:46 +02:00
Marcos García de La Fuente	87f97ed545	Merge branch 'develop' into units Conflicts: htdocs/commande/class/commande.class.php htdocs/compta/facture.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql htdocs/product/admin/product.php htdocs/product/card.php	2015-04-18 23:38:14 +02:00
jfefe	3825b89ead	Change companies and product title picto	2015-04-18 23:13:48 +02:00
jfefe	c905f88498	Change generic and setup image title	2015-04-18 23:13:48 +02:00
Marcos García de La Fuente	e2e6049c7f	Copyright	2015-04-18 20:50:03 +02:00
Marcos García de La Fuente	c07e26dcac	Merge branch 'develop' into fr-2613 Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-04-18 20:42:57 +02:00
Marcos García de La Fuente	dc790ff586	NEW: Feature request: A page to merge two thirdparties into one #2613	2015-04-18 20:41:09 +02:00
Laurent Destailleur	f7b2b00ebd	Merge pull request #2650 from FHenry/dev_pdfpropalmergeproductpdf NEW : Propal merge PDF product attached files (on option)	2015-04-18 20:18:57 +02:00
Maxime Kohlhaas	7b035d3b5f	Fix : menu financial was not displayed when only supplier module is activated	2015-04-18 20:11:19 +02:00
Laurent Destailleur	6e136616c6	Merge pull request #2649 from atm-maxime/develop Alert when oustanding amount excedeed	2015-04-18 20:04:25 +02:00
Maxime Kohlhaas	c3bcda74f3	Fix : unit price without tax is now subprice (not pu_ht)	2015-04-18 19:17:05 +02:00
Florian HENRY	62ef9743ea	Merge branch 'develop' into dev_pdfpropalmergeproductpdf	2015-04-18 19:16:33 +02:00
Juanjo Menent	c5d8fa4602	Fix: solves #2644	2015-04-18 19:14:30 +02:00
Laurent Destailleur	e1403b136c	Merge pull request #2639 from aternatik/stable_resource New : mark resource module as stable	2015-04-18 18:48:24 +02:00
Florian HENRY	e15d4c045d	NEW : Propal merge product card PDF into azur	2015-04-18 18:44:05 +02:00
philippe grand	838329f3d9	Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop	2015-04-18 18:36:00 +02:00
Maxime Kohlhaas	51522decf3	Fix : price in editkeyval function was forcing a price rounding	2015-04-18 18:33:46 +02:00
jfefe	5c4633d538	New : mark resource module as stable	2015-04-18 18:18:21 +02:00
Laurent Destailleur	08dfcf3afc	Merge	2015-04-18 18:14:55 +02:00
jfefe	f2e19f2326	Fix: error when deleting resource	2015-04-18 18:07:59 +02:00
philippe grand	eaf0fda6aa	fix syntax errors	2015-04-18 18:07:41 +02:00
Laurent Destailleur	ca05c9a26f	Fix PHPCS	2015-04-18 18:07:36 +02:00
Laurent Destailleur	873899a5d4	Merge pull request #2635 from FHenry/develop fix typo	2015-04-18 17:45:25 +02:00
Florian HENRY	bbed849911	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-18 17:37:49 +02:00
Florian HENRY	b7191a541c	All send email card works with model choice box	2015-04-18 17:15:36 +02:00
Laurent Destailleur	69b9de08b8	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-18 16:54:20 +02:00
Laurent Destailleur	ce81f58986	Fix several bugs into edit of supplier lines	2015-04-18 16:54:00 +02:00
Florian HENRY	cc887ceff3	fix typo	2015-04-18 16:45:45 +02:00
Laurent Destailleur	a5ba7c664e	Merge pull request #2627 from FHenry/develop NEW : Email template choose on thirdparty card	2015-04-18 15:24:46 +02:00
jfefe	fe01c4470d	Show tools menu when activating resource module	2015-04-18 15:04:44 +02:00
Juanjo Menent	f8a1bf9a10	Merge pull request #2621 from atm-maxime/develop Remove debug trace	2015-04-18 14:49:23 +02:00
Florian HENRY	d3592c8d58	typo	2015-04-18 13:09:35 +02:00
Juanjo Menent	dc74302985	Fix: Issues if strict mode option ONLY_FULL_GROUP_BY is activated	2015-04-18 11:32:01 +02:00
Florian HENRY	6391fd0c40	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-04-18 11:07:07 +02:00
Florian HENRY	3d8a7ee179	Start email template selector	2015-04-18 11:06:53 +02:00
Maxime Kohlhaas	7aba52c810	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2015-04-18 10:29:43 +02:00
Laurent Destailleur	deb62f1ffd	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/core/class/html.formother.class.php htdocs/core/lib/ajax.lib.php htdocs/expedition/list.php	2015-04-18 04:18:59 +02:00
Maxime Kohlhaas	e6c5b234fc	Remove debug trace	2015-04-18 03:54:33 +02:00
Laurent Destailleur	aab9b0ec60	Merge pull request #2620 from atm-maxime/develop_cat_multiselect New : categories as multi-select on product	2015-04-18 03:53:05 +02:00
Maxime Kohlhaas	9d8036e5a7	New : categories as multi-select on product	2015-04-18 03:12:42 +02:00
Maxime Kohlhaas	8db50e4606	Fix : menu for product batch	2015-04-18 01:39:41 +02:00
Maxime Kohlhaas	73a66f789c	New : shipment lists by status	2015-04-18 01:21:22 +02:00
Maxime Kohlhaas	3073aab48b	Fix : discount were not working anymore on supplier order and bill	2015-04-17 23:31:51 +02:00
Maxime Kohlhaas	24c3607403	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2015-04-17 22:58:06 +02:00
Laurent Destailleur	a034cda6ac	Better test	2015-04-17 22:48:39 +02:00
Laurent Destailleur	b8736b0a6f	Merge pull request #2457 from accett/patch-5 Update functionsnumtoword.lib.php	2015-04-17 22:42:19 +02:00
Florian HENRY	32e067c806	Remove debug	2015-04-16 14:22:48 +02:00
Laurent Destailleur	e508b28d74	Fix doliforge bug 1707	2015-04-15 18:53:39 +02:00
Laurent Destailleur	bf254baa02	Fix doliforge bug 1707	2015-04-15 18:50:41 +02:00
Laurent Destailleur	8511f1f7ef	Fix the data-role parameter	2015-04-15 18:14:26 +02:00
Laurent Destailleur	799ec63bf7	Merge pull request #2604 from defrance69/patch-57 Update modBanque.class.php	2015-04-14 20:05:41 +02:00
Raphaël Doursenaud	54b8aa8a0b	Fixed typo in task export Closes #2607, #2609	2015-04-14 19:14:16 +02:00
Maxime Kohlhaas	4d119065a8	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2015-04-14 13:01:41 +02:00
Laurent Destailleur	75b3fd442e	Add option to allow to filter list on project creation	2015-04-14 12:32:19 +02:00
BENKE Charlie	aa076b2af6	Update modBanque.class.php added the id of bordereau for link with the cheque	2015-04-14 10:19:41 +02:00
BENKE Charlie	db02cab550	Update modBanque.class.php added fk_bordereau on bank export 1 to link the 2 export	2015-04-14 01:23:42 +02:00
Laurent Destailleur	97cdc55839	NEW Module notification should details of emails into confirm box, not only number.	2015-04-13 17:04:18 +02:00
Laurent Destailleur	d7ef1e7da0	The supplier code was not visible on supplier pdf.	2015-04-13 14:25:27 +02:00
Laurent Destailleur	5dc1102601	Fix object not defined	2015-04-13 13:34:13 +02:00
Laurent Destailleur	ae103e34b8	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: build/debian/changelog htdocs/compta/facture.php htdocs/core/lib/price.lib.php htdocs/install/mysql/migration/3.6.0-3.7.0.sql htdocs/opensurvey/public/studs.php htdocs/projet/element.php	2015-04-13 13:08:46 +02:00
Laurent Destailleur	44f10ebec2	Fix: do not add new value	2015-04-13 13:01:23 +02:00
Laurent Destailleur	0e81dc7c6c	Add missing langs	2015-04-13 09:24:39 +02:00
Laurent Destailleur	e036e7baf4	Restore correct filling of page	2015-04-12 19:37:49 +02:00
Laurent Destailleur	c01677af2d	Merge pull request #2588 from defrance69/patch-56 Update pdf_paiement.class.php	2015-04-12 19:24:22 +02:00
Laurent Destailleur	8ebad7a395	A serious rewrite of a lot of code to have the module batch number stable.	2015-04-12 17:08:14 +02:00
Laurent Destailleur	1272b03e5e	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: build/debian/changelog htdocs/commande/fiche.php htdocs/compta/facture.php htdocs/core/menus/standard/eldy.lib.php htdocs/fourn/facture/fiche.php htdocs/product/stock/mouvement.php htdocs/projet/element.php htdocs/societe/rib.php htdocs/theme/bureau2crea/img/statut4.png	2015-04-12 12:03:59 +02:00
Laurent Destailleur	56a14da5d4	FIXME that are not bug are replaced with TODO Add control on batch movement (lot/serial is mandatory, and control eatby and sellby are same for each lot/serial)	2015-04-12 04:01:28 +02:00
Laurent Destailleur	74a4bca42c	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-04-11 22:52:27 +02:00
Laurent Destailleur	6889162d7a	Fix: management of vat type 2, 4 and 6 is now ok. Works for canada and ivory cost.	2015-04-11 22:51:53 +02:00
BENKE Charlie	59bff8afac	Update pdf_paiement.class.php Minors bug fix (first page with bad numbering) improvement compute of number of page better fillment of page with line (save the tree is good for karma)	2015-04-11 12:22:42 +02:00
Laurent Destailleur	530650b857	Make module productbatch stable	2015-04-10 11:59:41 +02:00
Laurent Destailleur	15531a7ebc	Better title for some boxes	2015-04-10 11:50:57 +02:00
Laurent Destailleur	503a4ff7a0	Enhance filtering for bank transaction and timesheet.	2015-04-09 20:40:49 +02:00
Laurent Destailleur	3ee2790737	Always sho project info when opening task card	2015-04-09 16:26:21 +02:00
braito4	914b324a67	minor bug drag and drop total line in tasks list	2015-04-09 10:37:54 +02:00
Laurent Destailleur	f6c2472d92	fix var not declared	2015-04-08 21:50:17 +02:00
Laurent Destailleur	c4daca2bac	Fix #1682	2015-04-08 21:34:04 +02:00
Laurent Destailleur	ca7a7a9038	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/compta/facture.php htdocs/product/stock/product.php	2015-04-08 20:43:51 +02:00
Laurent Destailleur	1bbecc0912	Restore link to stock for products.	2015-04-08 19:26:36 +02:00
Laurent Destailleur	0987aa1c74	Bad trans key	2015-04-08 17:42:28 +02:00
Laurent Destailleur	fc803e7000	Fix permission lost when enabled/disabled module.	2015-04-08 17:33:38 +02:00
Laurent Destailleur	bc69703888	Fix phpcs	2015-04-08 00:07:46 +02:00
Laurent Destailleur	f9c8b2e1cf	Merge pull request #2560 from Dolibarr/scrutinizer-patch-2 Scrutinizer Auto-Fixes	2015-04-07 23:56:40 +02:00
Juanjo Menent	1f4a131691	Fix: Bad permission assignments for stock movements actions Conflicts: htdocs/product/stock/product.php	2015-04-07 20:43:27 +02:00
Juanjo Menent	d7ba9b3312	Fix: Bad permission assignments for stock movements actions Conflicts: htdocs/core/menus/standard/eldy.lib.php htdocs/product/stock/mouvement.php	2015-04-07 20:40:48 +02:00
Juanjo Menent	9d8cb459f1	Fix: Bad permission assignments for stock movements actions	2015-04-07 20:28:45 +02:00
Frédéric FRANCE	0dc7bc0ddb	Add badge	2015-04-07 12:54:10 +02:00
Laurent Destailleur	6fa0234409	Uniformize code	2015-04-07 03:00:11 +02:00
Laurent Destailleur	ad50810c7a	Fix deprecated code	2015-04-07 02:48:19 +02:00
Scrutinizer Auto-Fixer	918ed34364	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2015-04-07 00:45:30 +00:00
Frédéric FRANCE	85d8d06ca4	Travis fix CMailFile.class.php	2015-04-06 20:02:29 +02:00
Laurent Destailleur	493392d89f	Remove warnings	2015-04-06 19:46:10 +02:00
Laurent Destailleur	c148f82452	Fix warning	2015-04-06 19:31:25 +02:00
Laurent Destailleur	02e8879d3b	NEW Feature to build a merged pdf with all unpaid invoice can work for paid invoices.	2015-04-06 19:11:31 +02:00
Laurent Destailleur	3d161deb17	Fix more robust function	2015-04-06 16:50:26 +02:00
Laurent Destailleur	b49705d5d0	Status and amount of object should always be visible.	2015-04-06 16:13:23 +02:00
Laurent Destailleur	0155d75f27	Merge pull request #2554 from aspangaro/develop-adherent Module member: move field note to note_private & typo	2015-04-06 12:58:52 +02:00
Laurent Destailleur	e2508287bd	Merge pull request #2537 from marcosgdf/cq Created Propal, FactureFourniseur, and Commande constants for status	2015-04-06 12:37:52 +02:00
Scrutinizer Auto-Fixer	4da737424e	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2015-04-06 10:25:30 +00:00
Laurent Destailleur	828dc2c9f4	Fix code standard	2015-04-06 12:22:52 +02:00
Laurent Destailleur	a5c74a7d95	Clean code	2015-04-06 11:59:58 +02:00
Laurent Destailleur	8fb14b122a	Fix phpcs	2015-04-06 11:28:06 +02:00
aspangaro	03b1db138e	Debug	2015-04-06 08:20:23 +02:00
Laurent Destailleur	5fa21f37f0	Fix trim label	2015-04-05 17:13:24 +02:00
Laurent Destailleur	2ec5595277	NEW Can install an external module from admin pages, if web server has permission for and if setup is ok for.	2015-04-04 00:19:03 +02:00
Laurent Destailleur	106a393054	NEW Add function dolCopyDir to copy directory with recursive content.	2015-04-03 23:42:56 +02:00
Laurent Destailleur	afecab3f39	Better error management for dol_uncompress	2015-04-03 18:42:07 +02:00
Marcos García de La Fuente	7075ac74c4	Merge branch 'develop' into units Conflicts: htdocs/comm/propal.php htdocs/comm/propal/class/propal.class.php htdocs/commande/card.php htdocs/commande/class/commande.class.php htdocs/compta/facture.php htdocs/compta/facture/class/facture.class.php htdocs/contrat/card.php htdocs/contrat/class/contrat.class.php htdocs/core/class/commonobjectline.class.php htdocs/core/tpl/objectline_create.tpl.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql htdocs/product/class/product.class.php	2015-04-03 15:45:54 +02:00
Laurent Destailleur	b01369a32e	Error management	2015-04-03 15:25:24 +02:00
Marcos García de La Fuente	6fe803cd86	Created Propal, FactureFourniseur, and Commande constants for status	2015-04-03 05:18:47 +02:00
Laurent Destailleur	69eaa032bf	Merge remote-tracking branch 'origin/3.7' into develop	2015-04-03 01:10:55 +02:00
Laurent Destailleur	98b1d6170d	Fix style fieldrequired must be used only in create/edit mode.	2015-04-03 01:07:17 +02:00
Frédéric FRANCE	5a17a51212	Update box_actions.php	2015-04-02 18:11:30 +02:00
Laurent Destailleur	4241244345	Fix: class not defined	2015-04-02 17:35:07 +02:00
Laurent Destailleur	c90a86e4a4	Fix filters for exports	2015-04-02 16:58:36 +02:00
Laurent Destailleur	761409caf6	Fix sql error	2015-04-02 15:17:07 +02:00
Laurent Destailleur	cf0f458a51	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/commande/dispatch.php htdocs/langs/el_GR/projects.lang htdocs/langs/en_GB/bills.lang htdocs/langs/en_GB/main.lang htdocs/langs/en_GB/orders.lang htdocs/langs/es_AR/bills.lang htdocs/langs/es_CO/admin.lang htdocs/langs/es_CO/main.lang htdocs/langs/es_ES/bills.lang htdocs/langs/es_ES/projects.lang htdocs/langs/fa_IR/categories.lang htdocs/langs/fr_FR/admin.lang htdocs/langs/fr_FR/bills.lang htdocs/langs/fr_FR/other.lang htdocs/langs/fr_FR/projects.lang htdocs/langs/lv_LV/bills.lang htdocs/langs/nb_NO/bills.lang htdocs/langs/pl_PL/bills.lang htdocs/langs/pl_PL/mails.lang htdocs/langs/pl_PL/projects.lang htdocs/langs/ro_RO/bills.lang htdocs/langs/ro_RO/products.lang htdocs/langs/ro_RO/projects.lang htdocs/langs/ru_RU/bills.lang htdocs/langs/ru_RU/projects.lang htdocs/langs/sl_SI/main.lang htdocs/langs/tr_TR/bills.lang htdocs/langs/tr_TR/projects.lang htdocs/langs/vi_VN/bills.lang	2015-04-02 13:57:20 +02:00
Laurent Destailleur	d8bec2fb59	Merge pull request #2507 from frederic34/doc4contact Add document tab for contact	2015-04-02 11:41:35 +02:00
Laurent Destailleur	051f3474c4	Merge pull request #2512 from frederic34/patch-9 Add badge	2015-04-02 11:25:06 +02:00
Laurent Destailleur	0187a9a4ee	Merge pull request #2511 from fappels/3.7 FIX: dispatch batch products	2015-04-02 11:24:01 +02:00
Laurent Destailleur	bff4b0e52e	Merge pull request #2506 from frederic34/patch-8 Add ORDER_CANCEL in interface_90_all_Demo.class.php	2015-04-02 11:22:38 +02:00
Laurent Destailleur	d8db32a99c	NEW: Introduce option SUPPLIER_ORDER_DOUBLE_APPROVAL to allow 2 approvals to make a supplier order approved. Activating this option introduce a new permission to the second level approval.	2015-04-01 21:00:51 +02:00
Laurent Destailleur	8e9c1c4747	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/commande/card.php htdocs/commande/class/commande.class.php htdocs/commande/list.php htdocs/core/class/notify.class.php htdocs/core/login/functions_dolibarr.php htdocs/exports/export.php htdocs/langs/en_US/admin.lang	2015-04-01 16:33:39 +02:00
Laurent Destailleur	16a620f926	Fix: Deadlock situation (when order were canceled, no way to make nothing on it) Fix: Don't know how I forgot this events into trigger system.	2015-04-01 16:07:22 +02:00
Laurent Destailleur	ad1e4134a9	Fix: bcc was lost if notif to bcc was also forced	2015-04-01 12:22:50 +02:00
Laurent Destailleur	1bc0f6c99f	Fix: do not show end date when it is same than start date	2015-04-01 12:02:32 +02:00
Laurent Destailleur	293495467f	Fix: Bad ref used into notification message	2015-04-01 11:30:48 +02:00
Laurent Destailleur	c71efc8f2e	Avoid pb with scrutinizer	2015-03-31 16:59:40 +02:00
Frédéric FRANCE	2a34ec9db1	Add badge	2015-03-31 16:26:32 +02:00
Francis Appels	bba8b206a1	FIX: dispatch batch products Fix dispatching batch products and add error message. Make DispatchProduct method backwards comp and add missing $trigger. Add missing ORDER_SUPPLIER_DISPATCH trigger to demo class.	2015-03-31 15:48:08 +02:00
frederic34	fe6227e93f	Typo	2015-03-31 08:45:36 +02:00
frederic34	bab04258e0	Add document tab for contact	2015-03-30 18:15:29 +02:00
Frédéric FRANCE	e602c43e12	Add ORDER_CANCEL in interface_90_all_Demo.class.php	2015-03-30 12:14:35 +02:00
Laurent Destailleur	86603b01dd	Merge pull request #2504 from marcosgdf/constants Implemented constants for some object types and statuses	2015-03-30 09:25:18 +02:00
Marcos García de La Fuente	8b8171c700	Merge branch 'develop' into commercial-name Conflicts: htdocs/comm/card.php	2015-03-30 03:25:57 +02:00
Marcos García de La Fuente	831177ef99	Implemented constants for Product class	2015-03-30 03:14:07 +02:00
Laurent Destailleur	b83e9ea32f	Merge branch 'loan' of https://github.com/frederic34/dolibarr into frederic34-loan Conflicts: htdocs/compta/bank/ligne.php	2015-03-30 02:56:26 +02:00
Marcos García de La Fuente	cc1d298f29	Merge branch 'develop' into constants Conflicts: htdocs/commande/card.php htdocs/compta/facture/class/facture.class.php	2015-03-30 02:36:46 +02:00
Laurent Destailleur	a3b5f35903	Merge pull request #2501 from frederic34/patch-5 Travis Fix for donation.lib.php	2015-03-30 02:00:14 +02:00
Laurent Destailleur	b66d8c9afc	Merge pull request #2496 from aspangaro/develop-ER-patch1 Fixed: HRM menu is not activated when only Expense Report module is acti...	2015-03-30 01:59:50 +02:00
aspangaro	c22a563422	New: Add management for accounting account in admin donation & correct bugs	2015-03-29 21:04:20 +02:00
Frédéric FRANCE	bcd7516e25	Fix for donation.lib.php	2015-03-29 18:22:45 +02:00
Laurent Destailleur	fd8d09c8c0	Fix avoid warning	2015-03-29 17:53:05 +02:00
Laurent Destailleur	73b2e0bd01	Merge pull request #2471 from marcosgdf/refactor refactor	2015-03-29 16:17:36 +02:00
aspangaro	a715ccfcb8	Fixed: HRM menu is not activated when only Expense Report module is activated	2015-03-29 15:11:41 +02:00
aspangaro	a92f68a5ed	Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc	2015-03-29 09:25:06 +02:00
aspangaro	ce6df7c022	Debug	2015-03-29 09:20:32 +02:00
Laurent Destailleur	b8bd27009e	Simplify code	2015-03-28 18:32:53 +01:00
Ion Agorria	043d11d785	check if $mc is a valid global	2015-03-28 18:22:01 +01:00
Laurent Destailleur	4887a28f91	Merge pull request #2492 from IonAgorria/mc-fix Fix: Check if $mc is a valid global	2015-03-28 18:20:28 +01:00
frederic34	be1595a187	Add tab for notes	2015-03-28 17:42:33 +01:00
Ion Agorria	1791631976	check if $mc is a valid global	2015-03-28 03:44:16 +01:00
Laurent Destailleur	813cb36424	Merge pull request #2476 from fmarcet/3.7 Fix: Not using where on sellist	2015-03-27 00:50:48 +01:00
aspangaro	4209deafd2	Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc	2015-03-26 21:04:20 +01:00
Laurent Destailleur	42c2c81e28	Fix detection of html was wrong with img	2015-03-26 12:05:52 +01:00
Laurent Destailleur	1ca95acbd7	Fix pb during export of agenda events Conflicts: htdocs/exports/export.php	2015-03-26 11:23:21 +01:00
Laurent Destailleur	ce8bd7a515	Fix pb during export of agenda events	2015-03-26 11:20:39 +01:00
aspangaro	b60f1e33d6	Debug	2015-03-26 06:29:16 +01:00
aspangaro	2b2b43afb6	Dir "Don"	2015-03-25 22:37:14 +01:00
aspangaro	679391d337	Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc	2015-03-25 20:59:48 +01:00
Laurent Destailleur	ab739e162c	Merge remote-tracking branch 'origin/3.7' into develop	2015-03-25 18:11:29 +01:00
Laurent Destailleur	8be08c692f	Fix some secuity tests were not done.	2015-03-25 18:10:45 +01:00
Laurent Destailleur	21b1f7cc26	Fix bad calculation of email for notifications	2015-03-25 14:51:12 +01:00
Laurent Destailleur	cc2d86bd58	Status of project was not visible on thirdparty card	2015-03-25 14:31:04 +01:00
fmarcet	456b11d148	Fix: Not using where on sellist	2015-03-25 11:23:05 +01:00
Laurent Destailleur	a32fc9efce	Hide logo when option MAIN_OPTIMIZEFORTEXTBROWSER is set. Avoid logo to overwrap box with css. Add help text.	2015-03-24 14:08:56 +01:00
Laurent Destailleur	f75c115140	Fix translation Fix permission not managed into get_menudiv.php	2015-03-24 11:19:51 +01:00
aspangaro	9d34b40897	Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc Conflicts: htdocs/compta/bank/account.php	2015-03-24 05:28:57 +01:00
Laurent Destailleur	efe9c21b81	Merge pull request #2382 from aspangaro/develop-loan NEW: Module loans	2015-03-23 23:28:57 +01:00
Laurent Destailleur	dd3a6edf4e	Merge pull request #2473 from marcosgdf/invoicesmenu NEW: Implemented statuses submenu for List menu of supplier and customer invoices.	2015-03-23 23:27:29 +01:00
Laurent Destailleur	3844d4e6f7	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: ChangeLog htdocs/core/boxes/box_activity.php htdocs/fourn/commande/card.php htdocs/user/card.php	2015-03-23 15:16:37 +01:00
Laurent Destailleur	b7a466c95f	Fix bad style for total	2015-03-23 13:50:14 +01:00
Marcos García de La Fuente	c6ad35e001	Implemented statuses submenu for List menu of supplier and customer invoices. Menu "Pending payment" has been moved to the "List" submenu.	2015-03-23 13:42:50 +01:00
aspangaro	be0ab4c9b4	Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-03-23 06:58:25 +01:00
Laurent Destailleur	e269aa83b5	More comments	2015-03-23 04:16:58 +01:00
Laurent Destailleur	042556a9cf	Better comments	2015-03-23 03:50:55 +01:00
Marcos García de La Fuente	3d50b41b8e	Reverted $rowid instead of $id property	2015-03-23 01:40:33 +01:00
Marcos García de La Fuente	4349f27299	Revert "Revert "Refactor 1""	2015-03-23 01:39:12 +01:00
Laurent Destailleur	f650a773c3	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-03-22 22:30:11 +01:00
Laurent Destailleur	5c36bb94f2	Work on theme material design	2015-03-22 22:29:52 +01:00
Laurent Destailleur	87faf530e0	Merge pull request #2468 from defrance69/patch-55 Update extrafields.class.php	2015-03-22 21:28:53 +01:00
Laurent Destailleur	abcebd7875	Merge pull request #2462 from defrance69/patch-54 Update extrafields.class.php	2015-03-22 21:27:38 +01:00
Laurent Destailleur	1a1959b52c	Fix: Solve conflict with imgup and imgdown class use for sort fields and to drag and drop lines.	2015-03-22 21:18:25 +01:00
BENKE Charles	730593b525	Update extrafields.class.php if no elementtype send at the function, they return an empty array	2015-03-22 20:26:20 +01:00
aspangaro	ad0f1aae6b	Move loan in htdocs	2015-03-22 20:19:22 +01:00
Laurent Destailleur	49824a0e56	Method colorStringToArray can accept the # Method monthArray can return short label of month	2015-03-22 18:17:25 +01:00
aspangaro	414d4c6432	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2015-03-22 18:08:12 +01:00
aspangaro	feef043513	Correct	2015-03-22 15:27:05 +01:00
Laurent Destailleur	17dc76838e	Fix bad url	2015-03-22 15:25:57 +01:00
Laurent Destailleur	2d90256640	Revert "Refactor 1"	2015-03-22 12:51:29 +01:00
Laurent Destailleur	a79a779b04	Merge pull request #2456 from marcosgdf/refactor-1 Refactor 1	2015-03-22 12:47:05 +01:00
Laurent Destailleur	55140afde4	Merge branch 'price-global-variables' of https://github.com/IonAgorria/dolibarr into IonAgorria-price-global-variables Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql htdocs/product/dynamic_price/editor.php	2015-03-22 12:45:04 +01:00
Laurent Destailleur	a55af4387b	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: .travis.yml htdocs/core/class/notify.class.php htdocs/product/stock/class/mouvementstock.class.php test/phpunit/AllTests.php test/phpunit/MouvementStockTest.php	2015-03-22 12:10:39 +01:00
aspangaro	9264482e25	Update works	2015-03-22 08:20:19 +01:00
aspangaro	15e50ed24f	Update works	2015-03-21 06:21:34 +01:00
Laurent Destailleur	73266bb965	Fix error when using a log hangler that make output into the http header. We must add a log before any generation of ouput content so we are sure a buffering of output has been started.	2015-03-21 01:22:05 +01:00
Laurent Destailleur	b8ed553365	We must keep the @, some tools use it to know it is login page.	2015-03-21 01:08:29 +01:00
aspangaro	c4a580723d	Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-03-20 06:36:06 +01:00
Laurent Destailleur	3a9c195f10	Fix hook management match spec	2015-03-20 00:34:55 +01:00
Laurent Destailleur	f44d91e153	NEW: The notification module accept keyword __SUPERVISOR__ to send notification to supervisor of user.	2015-03-19 11:47:30 +01:00
aspangaro	fa41132372	Move module Don in htdocs->donations	2015-03-19 05:22:42 +01:00
aspangaro	7b6cb59f4b	Move module Don in htdocs->donations	2015-03-19 05:17:10 +01:00
Laurent Destailleur	6ceda02eaa	NEW: Enhancement of module 'Notification by Email'. Show nb of notifications set. Can set several emails. Can set a threshold on amount for notifications. Add notification on supplier order validation.	2015-03-18 21:44:57 +01:00
Laurent Destailleur	a2676e5768	Fix: the type of notification sent was not filled	2015-03-18 21:06:55 +01:00
Laurent Destailleur	b0b88be81f	Sync transifex	2015-03-18 15:27:27 +01:00
Laurent Destailleur	ba526c5a2f	Merge remote-tracking branch 'origin/3.7' into develop	2015-03-18 14:32:58 +01:00
Laurent Destailleur	2c61717e10	Fix sql syntax error	2015-03-18 14:19:17 +01:00
BENKE Charles	d5afa1b29f	Update extrafields.class.php Link object : include only if something to display	2015-03-18 13:23:14 +01:00
Laurent Destailleur	7ef11b2f38	Fix selected attribute not set correctly	2015-03-18 13:16:59 +01:00
Laurent Destailleur	840b047468	Work on new timesheet input pages.	2015-03-18 11:20:08 +01:00
Laurent Destailleur	5d4d8151c1	Work on new timesheet input pages.	2015-03-18 11:04:50 +01:00
Laurent Destailleur	c700d8a8ec	Fix remove warning	2015-03-17 11:59:44 +01:00
Laurent Destailleur	166fda4909	Normalize class names	2015-03-17 11:26:23 +01:00
Laurent Destailleur	6e251690ab	Doxygen	2015-03-17 11:23:45 +01:00
Laurent Destailleur	84bea6166e	Doxygen	2015-03-17 10:55:45 +01:00
Laurent Destailleur	4fffeb3a89	Clean code	2015-03-17 10:52:27 +01:00
Laurent Destailleur	689d270552	Doxygen	2015-03-17 10:47:20 +01:00
Laurent Destailleur	bfd979224f	Var not declared	2015-03-17 10:38:25 +01:00
Laurent Destailleur	a73ff524e5	Merge pull request #2459 from Dolibarr/scrutinizer-patch-4 Scrutinizer Auto-Fixes	2015-03-17 00:38:40 +01:00
Scrutinizer Auto-Fixer	b693ed3f51	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2015-03-16 23:21:17 +00:00
Laurent Destailleur	141fa56d67	Fixed bad parameter	2015-03-17 00:11:04 +01:00
Laurent Destailleur	6d7b340cee	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/commande/class/commande.class.php htdocs/core/class/dolgraph.class.php htdocs/langs/en_AU/main.lang htdocs/langs/fr_FR/admin.lang htdocs/langs/fr_FR/main.lang htdocs/langs/fr_FR/other.lang	2015-03-16 18:30:30 +01:00
aspangaro	03bf12bdc0	Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc	2015-03-16 06:32:11 +01:00
aspangaro	1cd81f0e81	Work on module donations	2015-03-16 06:29:15 +01:00
Laurent Destailleur	daf853d040	Merge pull request #2455 from aspangaro/develop-ReviewER QUAL: Traduce terms + remove <center>	2015-03-16 02:11:29 +01:00
AcceTT Soluciones Computacionales	60d334f646	Update functionsnumtoword.lib.php Now the function convert since -1000000000000 to 1000000000000. Correct some bugs. Change $lang-> default to $langs	2015-03-15 17:47:51 -06:00
Marcos García de La Fuente	6ba3b900b7	PHPCS Fix	2015-03-15 23:42:11 +01:00
Marcos García de La Fuente	b822a1e3ad	Merge branch 'develop' into commercial-name Conflicts: htdocs/societe/class/societe.class.php	2015-03-15 18:20:17 +01:00
Marcos García de La Fuente	086e439543	Merge branch 'develop' into refactor-1 Conflicts: htdocs/core/tpl/objectline_view.tpl.php	2015-03-15 18:16:55 +01:00
Marcos García de La Fuente	efb9f7f4fd	Merge branch 'develop' into refactor-1 Conflicts: htdocs/fourn/class/fournisseur.commande.class.php htdocs/includes/tcpdi/fpdf_tpl.php	2015-03-15 18:07:30 +01:00
Marcos García de La Fuente	2e68b51a10	Merge remote-tracking branch 'upstream/develop' into develop	2015-03-15 17:52:07 +01:00
aspangaro	d69f066735	QUAL: Traduce terms + remove <center>	2015-03-15 14:04:07 +01:00
Marcos García de La Fuente	094538c07b	Implemented constants in Commande, Facture and Propal	2015-03-15 11:48:57 +01:00
BENKE Charles	8f0e514f83	Update pdf_paiement.class.php Add bank account on detail line (usefull when you have many bank account) Add society name in the header (usefull when you nanage many society)	2015-03-15 10:49:16 +01:00
Ion Agorria	2c80b39937	Configuration page of dinamic prices and price global variables editor	2015-03-14 16:51:38 +01:00
Ion Agorria	5f9b1fa029	Changes for applying new paths	2015-03-14 16:50:02 +01:00
Laurent Destailleur	10bbf463e7	Several bug fixes from scrutinizer	2015-03-14 14:55:41 +01:00
Laurent Destailleur	c4ff66c5d7	Merge remote-tracking branch 'origin/3.5' into 3.6	2015-03-14 13:46:18 +01:00
Laurent Destailleur	89b22be063	FIXED: Allowed 0 to be used as an account mask. Required by CEGID.	2015-03-14 13:44:26 +01:00
Laurent Destailleur	ca34575df4	FIXED: Allowed 0 to be used as an account mask. Required by CEGID.	2015-03-14 13:42:00 +01:00
BENKE Charles	9e62013bca	Update admin_extrafields_edit.tpl.php add new type of extrafields : link	2015-03-14 12:44:26 +01:00
BENKE Charles	4783db82ac	Update admin_extrafields_add.tpl.php new type of extrafield : link	2015-03-14 12:42:52 +01:00
Laurent Destailleur	5670e92842	Position of field into pdf baleine	2015-03-14 12:35:03 +01:00
BENKE Charles	0aa2360691	Update extrafields.class.php add new extrafields type 'link'	2015-03-14 12:31:22 +01:00
BENKE Charles	df9f822a70	Update commonobject.class.php new extafields type	2015-03-14 12:25:17 +01:00
BENKE Charles	41a05bc4ba	Update actions_extrafields.inc.php add new type of extrafields "link" : linked to dolibarr element	2015-03-14 12:04:00 +01:00
Laurent Destailleur	d056abc4e1	No need to have this protected. Property can be read with method show() and this method can be override.	2015-03-13 21:45:52 +01:00
Laurent Destailleur	ba2c0a2651	Clean code of hooks. Extrafield index on fk_object must be unique.	2015-03-13 20:27:54 +01:00
Laurent Destailleur	bc3f9bf800	Fix: the visible version was not enough to know version of dolibarr. We also need the MAIN_FEATURES_LEVEL.	2015-03-13 18:11:31 +01:00
Laurent Destailleur	687e3d250b	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: dev/fixdosfiles.sh htdocs/core/tpl/objectline_edit.tpl.php	2015-03-13 17:46:31 +01:00
Laurent Destailleur	a452823e1e	Include option FCKEDITOR_ENABLE_DETAILS_FULL to restore compatibility with 3.6	2015-03-13 15:20:08 +01:00
Laurent Destailleur	895b2c6e9c	Fix bad merge	2015-03-13 14:37:27 +01:00
Maxime Kohlhaas	60022ab80d	NEW : autofocus on product selection dropdown list or search field	2015-03-12 17:25:57 +01:00
Laurent Destailleur	e8e2f65ae5	Debug virtual product interface	2015-03-11 14:55:45 +01:00
Laurent Destailleur	958667ada0	Fix phpcs	2015-03-11 12:33:34 +01:00
aspangaro	3897e65425	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2015-03-11 05:28:59 +01:00
Laurent Destailleur	e2e95b5f8c	phpcs	2015-03-11 03:58:57 +01:00
Laurent Destailleur	a5645b626c	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/core/tpl/objectline_view.tpl.php htdocs/projet/element.php	2015-03-11 03:55:46 +01:00
Laurent Destailleur	c1432eb2da	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/compta/salaries/fiche.php htdocs/projet/element.php	2015-03-11 03:29:52 +01:00
Laurent Destailleur	ec322e2e29	Revert was not complete	2015-03-11 03:03:17 +01:00
Laurent Destailleur	4b8fa00edb	Merge pull request #2422 from guedel/sqlite3-dev Sqlite3 dev	2015-03-11 02:54:15 +01:00
Laurent Destailleur	52e9ae5fe4	Merge pull request #2442 from delcroip/patch-2 FIX: jdate returning -62169955200 on x64 machine	2015-03-11 02:35:36 +01:00
Laurent Destailleur	e8732df747	Merge pull request #2441 from aspangaro/develop-ReviewER FIXED: Review Expense Report	2015-03-11 02:14:13 +01:00
Laurent Destailleur	c271257452	Prepare extrafield for option by default into lists	2015-03-10 22:27:16 +01:00
Laurent Destailleur	548e720ca2	Uniformize code	2015-03-10 19:31:04 +01:00
Laurent Destailleur	b4a8f19696	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/core/class/extrafields.class.php	2015-03-10 18:37:13 +01:00
Laurent Destailleur	364b185442	Fix sql syntax	2015-03-10 18:33:14 +01:00
Laurent Destailleur	209f8946d0	All files must be lowercase	2015-03-10 14:17:58 +01:00
Laurent Destailleur	b564b754fc	Doxygen	2015-03-10 14:09:29 +01:00
Laurent Destailleur	9a3e5d7fc5	Fix code unreachable	2015-03-10 13:58:26 +01:00
Laurent Destailleur	12be50d4ba	Doxygen	2015-03-10 13:50:05 +01:00
Laurent Destailleur	51b67704ee	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-03-10 13:46:44 +01:00
Laurent Destailleur	35dfaf4dd1	Natural search on numeric works also with several space after operator	2015-03-10 10:14:24 +01:00
Laurent Destailleur	94acbeaa22	Prepare perms on extrafields	2015-03-09 21:40:24 +01:00
Laurent Destailleur	84695845bb	Some fixes into translation and permissions	2015-03-09 21:20:56 +01:00
Laurent Destailleur	88a29b7c9c	Add an advance permission to check/uncheck reception	2015-03-09 20:26:56 +01:00
Laurent Destailleur	bd81dec1a3	Fix missing translation	2015-03-09 19:28:38 +01:00
Laurent Destailleur	bd6f13e6ed	Can export extra fields of lines.	2015-03-09 19:13:19 +01:00
Florian HENRY	15dfd7c08d	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-03-09 10:52:09 +01:00
Estephe L.	9d320e4268	Fix Anchor link for quick access when editing. This is a quick fix to make anchor link works well when editing a proposal, order or invoice ...	2015-03-08 23:29:09 +01:00
delcroix Patrick	e6984bae9d	FIX: jdate returning -62169955200 on x64 machine on x64 machine jdate return -62169955200 instead of 0 when the input is 00-00-00 00:00:00 or equivalent same issue for mktime https://bugs.php.net/bug.php?id=53662	2015-03-08 12:37:07 +01:00
aspangaro	69dc3cdd61	Correct fk_statut & work en list	2015-03-08 08:21:49 +01:00
aspangaro	80ad1be820	Merge remote-tracking branch 'Upstream/develop' into develop-patch21	2015-03-08 06:40:31 +01:00
Laurent Destailleur	56b5bfd25b	NEW: Implement option SUPPLIER_ORDER_USE_DISPATCH_STATUS to add a status into each dispathing line of supplier order to "verify" a reception is ok. Status of order can be set to "total/done" only if line is verified.	2015-03-08 02:08:26 +01:00
Laurent Destailleur	6db3f1b30e	Add mdule askpricesupplier into MAIN__MODULES_FOR_EXTERNAL	2015-03-07 19:06:56 +01:00
aspangaro	df305bd316	Deactivate conflict with Mod Deplacement - Need to access on old data	2015-03-07 15:01:30 +01:00
Laurent Destailleur	9e4e9a5411	NEW: Can search on customer order amount into customer order list.	2015-03-06 20:59:18 +01:00
Laurent Destailleur	dd3f569ede	NEW: Enhance the natural_search function so we can use it to search numeric fields with criteria with operator <>= inside (< 100, >= 1000)	2015-03-06 20:34:00 +01:00
Laurent Destailleur	a1567778ab	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/core/tpl/objectline_create.tpl.php htdocs/fourn/commande/card.php	2015-03-06 18:51:55 +01:00
Laurent Destailleur	a169b3348e	Fix show alays date fields for contract module. Fix select of product were lost.	2015-03-06 14:36:22 +01:00
Florian HENRY	0d801be6a1	NEW: (Dev) DolGraph allow extended class to override $_stringtoshow	2015-03-06 06:12:47 +01:00
Scrutinizer Auto-Fixer	27e99793a3	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2015-03-06 02:10:01 +00:00
Laurent Destailleur	e67c328cef	Merge pull request #2429 from defrance69/patch-50 Update modFacture.class.php	2015-03-06 02:05:00 +01:00
Laurent Destailleur	049174b76f	Fix bugs reported by https://scrutinizer-ci.com/g/Dolibarr/dolibarr/	2015-03-06 01:53:02 +01:00
Laurent Destailleur	1660c1c05b	Fix bug introduced with var_dump	2015-03-06 01:30:46 +01:00
Laurent Destailleur	97f36825df	Work on new timesheet page	2015-03-05 21:47:50 +01:00
aspangaro	11704e0807	Merge remote-tracking branch 'Upstream/develop' into develop-loan Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-03-05 20:24:53 +01:00
Guillaume de Lestanville	dd2594692e	Updating compatibility with Sqlite3 - Replace USING syntax by IN SELECT syntax - Fix error on database creation - Removing test on username parameter when installing.	2015-03-05 17:35:37 +01:00
Laurent Destailleur	d7ab3f112c	NEW: Show difference between timespent by everybody and time spent by user making timesheet into timesheet pages. NEW: Can enter start hours of task when creating timesheet	2015-03-05 13:48:57 +01:00
Laurent Destailleur	d119397129	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/societe/class/societe.class.php	2015-03-05 11:38:16 +01:00
Laurent Destailleur	e431e24889	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-03-05 11:14:01 +01:00
Laurent Destailleur	c36f92396b	Add navigation into the new timesheet week page. Fix bad merge	2015-03-05 11:13:44 +01:00
guillaume	0ef46b06f4	Sqlite3-PDO restoration FR: - Restauration de la version PDO dans sqlite.class.php et désactivation. - Ajout de la classe de base de données Sqlite3 dans sqlite3.class.php EN: - revert of the PDO version of sqlite.class.php and deactivation. - add database class Sqlite3 into sqlite3.class.php.	2015-03-05 10:52:37 +01:00
BENKE Charles	703a6c1b54	Update modFacture.class.php add fk_bank on bill export, this fields is needed to link with external accounting	2015-03-05 00:38:54 +01:00
Laurent Destailleur	ec4c1a493f	Merge pull request #2424 from FHenry/develop NEW : Better extrafeild management on proposal and contract line NEW : Add company information into category contact export	2015-03-04 23:14:05 +01:00
Laurent Destailleur	f0f0e7bfbb	Merge pull request #2415 from aspangaro/develop-patch16 NEW: Add bank account owner in invoice/proposal/orders footer	2015-03-04 23:07:46 +01:00
Laurent Destailleur	7b7b5090c7	Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into atm-ph-incoterm Conflicts: htdocs/comm/propal.php htdocs/fourn/commande/card.php htdocs/fourn/facture/card.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-03-04 23:03:29 +01:00
Laurent Destailleur	40adbe5a72	Merge pull request #2420 from aspangaro/develop-patch17 NEW: [T1848] Merge bank card & account card	2015-03-04 21:09:28 +01:00
Laurent Destailleur	09035c1fee	Merge branch 'fetchobject' of https://github.com/frederic34/dolibarr into develop Conflicts: htdocs/includes/tcpdi/fpdf_tpl.php htdocs/projet/card.php	2015-03-04 20:52:54 +01:00
fmarcet	1a02f6aa80	Fix: Masks works with thirdparty type	2015-03-04 18:18:55 +01:00
Laurent Destailleur	96de912661	NEW: Add module "Supplier commercial proposals" to requests quotation/price to suppliers. Merge branch 'new_ask_price' of https://github.com/atm-ph/dolibarr into atm-ph-new_ask_price Conflicts: htdocs/core/class/commonobject.class.php htdocs/core/class/html.formfile.class.php htdocs/core/tpl/document_actions_post_headers.tpl.php htdocs/core/tpl/objectline_edit.tpl.php htdocs/core/tpl/objectline_view.tpl.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/commande/card.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-03-04 17:54:43 +01:00
Marcos García de La Fuente	41c55d1913	Better fix for bug-1825. There are actually a lot to things to escape and escaped methods can make conflict with similar names so it is better to make a md5 to have a unique value	2015-03-04 11:55:17 +01:00
Marcos García de La Fuente	f94f9d1e57	Removed $permtoedit variable	2015-03-04 11:19:45 +01:00
Marcos García de La Fuente	54b6b199c7	Documented missing properties and removed redundant documentation (cherry picked from commit 6124f6a)	2015-03-04 10:37:48 +01:00
Marcos García de La Fuente	e1982c54d9	Moved duplicated code to common class	2015-03-04 10:37:47 +01:00
Marcos García de La Fuente	f82df1e634	Refactorred supplier order to match with objectline templates	2015-03-04 10:37:47 +01:00
Marcos García de La Fuente	174f1cb5f7	Refactored supplier invoice line view to fit commonobjectline view	2015-03-04 10:37:47 +01:00
Marcos García de La Fuente	b84cf4afac	Renamed FactureFournisseurLine to SupplierInvoiceLine	2015-03-04 10:37:46 +01:00
Marcos García de La Fuente	4c08d34bb5	Standardized $rowid as property	2015-03-04 10:37:46 +01:00
Marcos García de La Fuente	b0e728251a	Every line has a $rowid property	2015-03-04 10:37:45 +01:00
Marcos García de La Fuente	ad72425291	Moved some variables from FactureLigne to CommonInvoiceLine	2015-03-04 10:37:43 +01:00
Marcos García de La Fuente	0170d409d3	Merge remote-tracking branch 'upstream/develop' into develop Conflicts: htdocs/core/lib/functions.lib.php	2015-03-04 10:16:25 +01:00
Florian HENRY	14847e2b5d	Better column order	2015-03-04 10:08:13 +01:00
Florian HENRY	fdbb0ace8b	NEW : Add company information into category contact export	2015-03-04 10:00:37 +01:00
Laurent Destailleur	4c1d51bd39	phpcs	2015-03-04 02:28:16 +01:00
Laurent Destailleur	6f96d4cd5c	Minimum style	2015-03-04 02:18:20 +01:00
Laurent Destailleur	2c3a412c3a	Fix export extrafield on supplier orders	2015-03-04 02:08:51 +01:00
Laurent Destailleur	52425648bf	NEW: When using transfer or correct stock from warehouse, after recording we go back to the warehouse page.	2015-03-04 01:54:26 +01:00
Laurent Destailleur	60a6d8789f	Merge remote-tracking branch 'origin/3.7' into develop	2015-03-04 01:14:27 +01:00
Laurent Destailleur	107a16ed75	Work on timesheet module	2015-03-04 00:53:35 +01:00
Laurent Destailleur	fddbca50b1	Start to introduce MAIN_EMAIL_ADD_TRACK_ID option to test inclusion of tracking id into email.	2015-03-03 18:33:53 +01:00
Laurent Destailleur	35733c4c08	More comments	2015-03-03 17:47:17 +01:00
guillaume	1b89b8c808	Ajout de la liste des paramètres en utilisant l'instruction PRAGMA	2015-03-03 15:22:52 +01:00
guillaume	e4edafd42a	Ajout de la liste des paramètres en utilisant l'instruction PRAGMA	2015-03-03 15:21:14 +01:00
guillaume	8de170bfc2	Ajout de fonctions pour le traitement des dates avec SQLITE.	2015-03-03 13:06:20 +01:00
aspangaro	fafebf5b2a	NEW: [T1758] Merge bank card & account card	2015-03-02 22:44:11 +01:00
aspangaro	c119ce382e	Merge remote-tracking branch 'Upstream/develop' into develop-loan Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-03-02 21:05:38 +01:00
frederic34	4af26c119f	fetch object in include file	2015-03-02 17:54:35 +01:00
Florian HENRY	d80a8bbdba	revert bug1840 to eldy solution	2015-03-02 10:13:06 +01:00
Florian HENRY	d9621a1d23	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 Conflicts: htdocs/contrat/card.php	2015-03-02 10:02:54 +01:00
Laurent Destailleur	73afe1513d	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/commande/card.php htdocs/core/lib/functions.lib.php htdocs/projet/index.php	2015-03-02 03:07:19 +01:00
Laurent Destailleur	48356005c3	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-03-02 03:00:29 +01:00
Laurent Destailleur	3475433eaf	Fix: the bank information were visible into pdf but were not using correct setup to decide which bank to show.	2015-03-02 02:59:59 +01:00
Laurent Destailleur	2f24622a7c	NEW: Introduce TCPDI as replacement of FPDI.	2015-03-02 01:38:40 +01:00
Marcos García de La Fuente	7876238823	Fixed bug with hide/show checkboxes reported by Ruben Almeida (aruben) When an external calendar was called "mytasks", Dolibarr events were also hidden too.	2015-03-02 01:36:27 +01:00
Marcos García de La Fuente	e6c8cac381	Removed TODO and deprecated tag of dol_htmlentities and revert substitution commit	2015-03-02 01:16:35 +01:00
Laurent Destailleur	0774669331	Update comment	2015-03-02 00:37:47 +01:00
Laurent Destailleur	ce8cbee5d2	Merge pull request #2399 from marcosgdf/misc misc	2015-03-02 00:31:27 +01:00
Laurent Destailleur	50d8137618	Merge pull request #2384 from marcosgdf/better-practice Better practice in getBrowserInfo	2015-03-02 00:28:40 +01:00
Laurent Destailleur	6d3381bfa0	Merge pull request #2398 from marcosgdf/deprecated Marked getStaticMember as deprecated	2015-03-02 00:23:36 +01:00
Laurent Destailleur	7fc0c2b485	Merge pull request #2397 from atm-alexis/new_add_doc_on_project_linked_elements New add doc on project linked elements	2015-03-02 00:19:21 +01:00
aspangaro	e24a317f0f	NEW: Add bank account owner in invoice/proposal/orders footer	2015-03-01 21:31:03 +01:00
Laurent Destailleur	a0f8b39250	Prepare code for a perday week timesheet input of time spent.	2015-03-01 17:45:36 +01:00
Laurent Destailleur	416e0a766e	Fix: we must use status to find label of status	2015-03-01 16:24:02 +01:00
Marcos García de La Fuente	b4c84fac9d	NEW: [ task #977 ] New option to manage product unit Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements	2015-03-01 12:42:38 +01:00
Laurent Destailleur	b888a04af9	Reduce a lot of duplicate code. Move all tables of extrafields setup into a tpl file.	2015-02-28 20:14:26 +01:00
Marcos García de La Fuente	c925b09946	CodeSniffer fix	2015-02-28 19:26:41 +01:00
Laurent Destailleur	51fff77355	Fix: time 0 must be different than time unknown.	2015-02-28 19:02:03 +01:00
Laurent Destailleur	4d226885cb	Rewrite code for supplier order and invoice to use shared code of customer supplier and invoice. Work on extrafield for supplier order and invoice.	2015-02-28 18:10:31 +01:00
Marcos García de La Fuente	60e2524fc2	Merge remote-tracking branch 'upstream/develop' into better-practice Conflicts: htdocs/core/lib/functions.lib.php test/phpunit/FunctionsLibTest.php	2015-02-28 14:39:14 +01:00
Marcos García de La Fuente	2ba795fcbc	NEW: [ task #851 ] Add a new field: Commercial name	2015-02-28 14:30:06 +01:00
Laurent Destailleur	8e26c71fa7	Rewrite code for supplier order and invoice to use shared code of customer supplier and invoice. Work on extrafield for supplier order and invoice.	2015-02-28 04:59:27 +01:00
Laurent Destailleur	ef14e4e7ed	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/compta/facture.php htdocs/fourn/class/fournisseur.product.class.php	2015-02-28 03:11:15 +01:00
Laurent Destailleur	5d1545ad1f	Work on supplier order and customer extrafields Use templates to show/edit supplier order and invoice lines	2015-02-27 18:05:12 +01:00
guillaume	4ede9295a6	Correction de la gestion d'erreur.	2015-02-27 14:06:53 +01:00
Laurent Destailleur	828716420b	Comment of function was not correct	2015-02-26 16:19:45 +01:00
Laurent Destailleur	a87c867c28	Translation	2015-02-26 16:02:03 +01:00
Laurent Destailleur	4bde7e9f51	Fix: Missing error management	2015-02-26 14:25:30 +01:00
Laurent Destailleur	daabc113a5	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: README.md htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/cashjournal.php	2015-02-26 13:36:07 +01:00
Laurent Destailleur	41a74c62e2	Fix trigger to insert lines where called when inserting line but also when cloning parent object, making no way to know when to use them or not. I introduced a context to allow code to know that and do not triggers twice.	2015-02-26 13:03:17 +01:00
Marcos García de La Fuente	f117b65a17	Removed silent operator for PHP 4 in function dol_html_entity_decode	2015-02-25 23:01:07 +01:00
Marcos García de La Fuente	f2fededd2c	Drop usage of deprecated dol_htmlentities function	2015-02-25 22:48:45 +01:00
Marcos García de La Fuente	fb959abc63	Misc PHPdoc fixes	2015-02-25 18:24:36 +01:00
Marcos García de La Fuente	0a5f17f179	Undefined variable + Unreachable statement	2015-02-25 18:06:54 +01:00
Marcos García de La Fuente	91fa823075	Marked getStaticMember as deprecated	2015-02-25 18:03:31 +01:00
Marcos García de La Fuente	40a5c15616	Improved getBrowserInfo documentation	2015-02-25 16:45:14 +01:00
Marcos García de La Fuente	f598963d6b	Fixed regression	2015-02-25 16:41:51 +01:00
guillaume	9839420a68	Correction de la gestion d'erreur.	2015-02-25 15:44:06 +01:00
guillaume	24b069fcb0	Utilisation de la librairie Sqlite3 et création de fonctions personnalisées pour la compatibilité avec MySQL. Certains formats de date ne sont pas complètement pris en compte.	2015-02-25 14:31:41 +01:00
guillaume	207fa671b1	Mise en place de l'initialisation de la base avec PDO SQlite	2015-02-25 09:04:11 +01:00
aspangaro	4803a1fb89	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2015-02-25 06:59:27 +01:00
Alexis Algoud	b4f3068141	NEW add PDF icon on linked element into project	2015-02-24 18:20:19 +01:00
Laurent Destailleur	3fb3e4af4e	Merge pull request #2386 from lrq3000/3.7 Fix lastrowid-table option when defining imports	2015-02-24 17:16:17 +01:00
Laurent Destailleur	fec9e222b1	Merge pull request #2391 from aspangaro/develop-patch10 FIXED: Module Expense Report - Correct init	2015-02-24 17:11:32 +01:00
Laurent Destailleur	72da9b52af	Merge pull request #2380 from marcosgdf/bug-1825 Better fix for bug 1825	2015-02-24 17:07:17 +01:00
Laurent Destailleur	fd9fc191fc	Merge pull request #2388 from aspangaro/develop-patch8 Module Expense Report: reactivate conflict with modDeplacement	2015-02-24 17:06:43 +01:00
Laurent Destailleur	f23234356e	Merge pull request #2387 from aspangaro/develop-patch7 Move new module Expense Report in hrm	2015-02-24 17:03:12 +01:00
Laurent Destailleur	714b3d277c	Merge pull request #2394 from aspangaro/develop-patch12 FIXED: Update licence to GPLv3	2015-02-24 16:56:01 +01:00
Laurent Destailleur	70c778c728	I keep this feature hidden, because according to package target, dolibarr does not contains same files. We must first find a solution before making this feature public.	2015-02-24 15:49:39 +01:00
Laurent Destailleur	562348eb34	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/fourn/commande/dispatch.php	2015-02-24 15:42:28 +01:00
Laurent Destailleur	74f15680e1	Fix missing fields into import of thirdparties. Fix import failed to find type of companny from source file. Fix import date of creation has wrong check rule.	2015-02-24 15:40:50 +01:00
Laurent Destailleur	44c392ca23	Fix missing profid5 and 6	2015-02-24 13:35:37 +01:00
Laurent Destailleur	472181a03b	Merge pull request #2374 from frederic34/filecheck Files Integrity Checker	2015-02-24 10:08:39 +01:00
aspangaro	c1069eea47	FIXED: Update licence to GPLv3	2015-02-23 22:04:01 +01:00
aspangaro	be3fd5529a	FIXED: Module Expense Report - Correct init	2015-02-23 20:31:44 +01:00
Laurent Destailleur	6d3834b3b9	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/index.php htdocs/projet/class/project.class.php test/phpunit/BankAccountTest.php	2015-02-23 14:59:24 +01:00
phf	11a0624e39	[CORE] FIX Travis phpcs (#incoterm).	2015-02-23 11:19:00 +01:00
Marcos García de La Fuente	7e07638fba	Little refactor	2015-02-23 10:51:43 +01:00
Marcos García de La Fuente	71b98ee82b	Safari can appear in iPad, iPod, iPhone and future Apple products, it is not fair to attach it to one of them.	2015-02-23 10:42:10 +01:00
phf	127868899d	Merge branch 'develop' into incoterm Conflicts: htdocs/commande/class/commande.class.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql	2015-02-23 10:42:01 +01:00
phf	c459794999	[CORE] gestion de l'affichage de l'incoterm sur les différents PDF de base (#incoterm).	2015-02-23 10:36:44 +01:00
aspangaro	d0cc072a58	Module Expense Report: reactivate conflictwith modDeplacement	2015-02-23 06:49:11 +01:00
aspangaro	95f211775b	Move new module Expense Report in hrm	2015-02-23 06:45:03 +01:00
Laurent Destailleur	1bba3a01e2	phpcs	2015-02-22 23:41:34 +01:00
Laurent Destailleur	b04682db4c	Fix Edit of extrafield on supplier invoice or order was deleteing other fields. Fix Missing escapment Fix new field delivery date was only into edit page	2015-02-22 17:41:02 +01:00
Stephen L	fe62e038ca	Fix lastrowid-table option when defining imports (fix extrafields fk_object value) Signed-off-by: Stephen L. <lrq3000@gmail.com>	2015-02-22 14:34:51 +01:00
Marcos García de La Fuente	702c19dab3	Refactored function getBrowserInfo	2015-02-22 13:17:57 +01:00
Laurent Destailleur	2bc6ac4671	Finished new module to manage expense reports ! Fix export to support corectly multicompany	2015-02-22 13:16:49 +01:00
Marcos García de La Fuente	ce916f3bcb	Better practice in getBrowserInfo	2015-02-22 12:35:51 +01:00
Laurent Destailleur	6d1324b463	Work on expense report module	2015-02-21 16:15:54 +01:00
aspangaro	3aa6c8c855	Correct auguria menu	2015-02-21 15:19:18 +01:00
Laurent Destailleur	30a5111c68	Work on expense report module	2015-02-21 15:18:05 +01:00
aspangaro	63099727d0	Merge remote-tracking branch 'Upstream/develop' into develop-loan	2015-02-21 15:10:35 +01:00
frederic34	ad3e91dc9f	WIP	2015-02-21 14:06:33 +01:00
Laurent Destailleur	5dffe4b440	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-02-21 12:58:14 +01:00
Laurent Destailleur	070accd1e0	Work on new module expense report	2015-02-21 12:57:17 +01:00
Laurent Destailleur	1ca4e377d5	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-02-20 23:47:09 +01:00
Laurent Destailleur	9ac38dee45	Merge pull request #2367 from marcosgdf/bug-1652 Fix: [ bug #1652 ] Margin tab should not be shown for thirds not clients	2015-02-20 23:27:53 +01:00
Laurent Destailleur	56635cea98	Merge branch 'bug-1790' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-1790 Conflicts: ChangeLog	2015-02-20 23:23:57 +01:00
Laurent Destailleur	938936b8f2	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/core/lib/agenda.lib.php htdocs/core/lib/functions.lib.php	2015-02-20 22:51:47 +01:00
Laurent Destailleur	e1e31de229	Merge remote-tracking branch 'origin/3.5' into 3.6	2015-02-20 20:15:04 +01:00
Laurent Destailleur	41196c01e9	Add hidden option FCKEDITOR_ALLOW_ANY_CONTENT to solve bug of editor not accepting all html tags from templates.	2015-02-20 15:48:54 +01:00
Marcos García de La Fuente	d46c76311c	Correction	2015-02-20 10:23:17 +01:00
Marcos García de La Fuente	3a917a0d1f	Merge branch '3.6' into bug-1825	2015-02-20 10:19:08 +01:00
Marcos García de La Fuente	fd18aa8717	Better fix for Bug #1825	2015-02-20 10:17:02 +01:00
frederic34	2b19f75460	Files Integrity Checker	2015-02-19 21:26:03 +01:00
Florian HENRY	4ba2a1344e	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-02-19 10:15:57 +01:00
Laurent Destailleur	639aaebacb	Merge branch 'bug-1825' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-1825 Conflicts: ChangeLog	2015-02-19 09:47:22 +01:00
Laurent Destailleur	ec56667f5e	Fix: [ bug #1849 ] Broken flag image when a contact does not have a country set	2015-02-19 09:44:22 +01:00
Laurent Destailleur	94751ba57b	Merge pull request #2361 from aspangaro/3.7-patch3 [T1728] Deactivate RIB suggest in proposals/invoices/orders	2015-02-19 09:41:39 +01:00
Laurent Destailleur	a6e2e5ffcb	Merge pull request #2360 from delcroip/patch-1 export on user	2015-02-19 00:14:04 +01:00
Laurent Destailleur	d1a4b6c2c5	phpcs	2015-02-19 00:04:35 +01:00
Laurent Destailleur	e3713c8b6d	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/admin/tools/eaccelerator.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/commande/dispatch.php	2015-02-19 00:01:26 +01:00
Laurent Destailleur	774389940e	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: ChangeLog htdocs/comm/propal/list.php htdocs/compta/bank/ligne.php htdocs/compta/resultat/clientfourn.php htdocs/compta/salaries/fiche.php htdocs/core/lib/functions.lib.php htdocs/fourn/facture/paiement.php	2015-02-18 23:51:41 +01:00
Laurent Destailleur	25ba9d2c97	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-02-18 23:43:00 +01:00
Laurent Destailleur	bd9c168e3c	Doxygen	2015-02-18 23:42:39 +01:00
Laurent Destailleur	316e5c2f19	Merge pull request #2358 from marcosgdf/board-refactor Refactored dashboard indicator	2015-02-18 23:39:15 +01:00
Laurent Destailleur	2f5c94fb4a	Merge pull request #2357 from KreizIT/fix_mssql Fix mssql	2015-02-18 23:32:48 +01:00
Laurent Destailleur	22fdcfc272	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-02-18 22:54:44 +01:00
Laurent Destailleur	4963555669	Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into marcosgdf-misc Conflicts: htdocs/barcode/codeinit.php	2015-02-18 22:54:02 +01:00
Laurent Destailleur	6d25cf6f6a	Merge branch 'bug-1832' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-1832 Conflicts: ChangeLog	2015-02-18 22:41:32 +01:00
Laurent Destailleur	06c90e67bb	Merge pull request #2339 from KreizIT/fix_1829 FIXED: #1829 POS not compatible with batch products	2015-02-18 22:38:19 +01:00
Laurent Destailleur	1c0f22b905	Merge pull request #2368 from frederic34/php-iban New: Add php-iban lib 1.4.6 to check iban information.	2015-02-18 22:11:31 +01:00
Laurent Destailleur	b6947dbe2c	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/core/modules/DolibarrModules.class.php	2015-02-18 22:04:26 +01:00
Laurent Destailleur	cc1d506614	Miscelaneous debug on barcode features.	2015-02-18 21:01:17 +01:00
frederic34	4bbbff8d69	Add BIC/SWIFT Validation	2015-02-17 22:04:16 +01:00
Laurent Destailleur	1e1543403b	New: Add option SUPPLIER_ORDER_AUTOADD_USER_CONTACT to automatically set user approving as contact following supplier order.	2015-02-17 19:49:17 +01:00
Laurent Destailleur	ad67fe50a3	Correct management when delivery date is universal time format.	2015-02-17 17:21:41 +01:00
Laurent Destailleur	685b8d722d	Fix: Bad hook name	2015-02-17 16:46:37 +01:00
frederic34	376eadd22c	Merge remote branch 'upstream/develop' into php-iban	2015-02-17 11:43:23 +01:00
frederic34	07197f3ca0	Add libs	2015-02-17 11:41:50 +01:00
frederic34	9d0ffb7e85	Add php-iban and check IBAN	2015-02-17 10:23:31 +01:00
Laurent Destailleur	bc88917b81	phpcs	2015-02-17 10:18:01 +01:00
Laurent Destailleur	a64cd69639	phpcs	2015-02-17 09:56:19 +01:00
Marcos García de La Fuente	529d4447ef	Fix: [ bug #1652 ] Margin tab should not be shown for thirds not clients	2015-02-17 00:04:31 +01:00
Marcos García de La Fuente	fa55c60c35	Renamed WorkBoardResponse to WorkboardResponse	2015-02-16 23:52:49 +01:00
Marcos García de La Fuente	c01281a538	Renamed WorkBoardResponse::$late_url to WorkBoardResponse::$url_late	2015-02-16 23:45:52 +01:00
Laurent Destailleur	23562a01ab	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/expedition/class/expedition.class.php htdocs/install/mysql/migration/3.6.0-3.7.0.sql htdocs/langs/en_US/stocks.lang	2015-02-16 20:59:04 +01:00
Laurent Destailleur	1e78d0e8d4	New: Introduce hidden option STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS to solve, with no risk, a missing control on missing warehouse.	2015-02-16 20:46:54 +01:00
Laurent Destailleur	213c818204	Debug serial/lot management	2015-02-16 20:14:16 +01:00
Marcos García de La Fuente	3efb737cbf	Fix: [ bug #1845 ] Undefined "$conf->browser->ie" var in "functions.lib.php"	2015-02-16 12:30:10 +01:00
Marcos García de La Fuente	6f08893016	Fix: [ bug #1846 ] Browser IE11 not detected	2015-02-16 12:26:20 +01:00
Marcos García de La Fuente	0a81fe667f	Fix: [ bug #1825 ] External agenda: hide/show checkbox doesn't work	2015-02-16 10:44:10 +01:00
aspangaro	05dc308e91	[T1728] Deactivate RIB suggest in proposals/invoices/orders	2015-02-16 06:47:37 +01:00
Laurent Destailleur	3cf4b80baa	Fix missing test of action when using canvas	2015-02-16 02:02:11 +01:00
Laurent Destailleur	2e0b2fb012	Work on expensereport module	2015-02-15 22:49:23 +01:00
Laurent Destailleur	e5b401c8f2	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/langs/es_ES/agenda.lang htdocs/langs/fr_FR/admin.lang htdocs/langs/fr_FR/bills.lang htdocs/langs/fr_FR/errors.lang htdocs/langs/fr_FR/projects.lang htdocs/langs/fr_FR/stocks.lang htdocs/langs/fr_FR/suppliers.lang	2015-02-15 19:51:49 +01:00
Laurent Destailleur	eef1e17c61	Fix: default vat	2015-02-15 19:38:20 +01:00
Laurent Destailleur	b00de9707a	Work on expensereport module	2015-02-15 19:13:16 +01:00
delcroix Patrick	8a7d4ea71d	export on user to be able to choose the user for reporting purpose (no column named Name in the user table)	2015-02-15 17:01:47 +01:00
Marcos García de La Fuente	2c074a94f3	Fix: [ bug #1790 ] Sending a test mail from admin page, gives "File already exists" error	2015-02-15 15:57:38 +01:00
Marcos García de La Fuente	d5fd20e911	Renamed BoardResponse to WorkBoardResponse	2015-02-15 15:10:51 +01:00
Marcos García de La Fuente	d1f73499e9	Refactored dashboard indicator	2015-02-15 15:01:28 +01:00
Laurent Destailleur	3b09dc53cd	Fix regression on total visible on invoice since situation invoice.	2015-02-14 20:32:11 +01:00
Laurent Destailleur	448655ea45	First work on a new module for expense report matching dolibarr standard to replace current one.	2015-02-14 18:39:45 +01:00
KreizIT	7d51ae6789	Fix typo	2015-02-14 16:33:05 +01:00
KreizIT	0c0c442248	Make MS SQL working	2015-02-14 16:27:00 +01:00
Laurent Destailleur	bd4b401281	New: Introduce "_deprecated" keyword into module version when module has been superseed by another one.	2015-02-14 15:10:06 +01:00
Laurent Destailleur	c596fa1475	Introduce a protection to avoid migration if database has critical bugs making data lost.	2015-02-14 12:24:16 +01:00
Laurent Destailleur	6adfc6f6f4	Work on batch module. Add batch, eatby and sellby into movement table. Clean language files for direct print module.	2015-02-12 15:23:31 +01:00
Laurent Destailleur	122a7c199c	Prepare a module for mail document generation.	2015-02-12 00:10:15 +01:00
Laurent Destailleur	179cbbd187	Maxi debug and enhancement of module batch.	2015-02-11 22:54:06 +01:00
Laurent Destailleur	17d2368bdc	Fix we must use short key	2015-02-11 15:07:20 +01:00
Laurent Destailleur	370f6b907e	Fix we must use short key	2015-02-11 14:44:40 +01:00
Laurent Destailleur	8a6d3aa633	Clean module print system	2015-02-11 14:22:44 +01:00
Laurent Destailleur	d5ec19ef83	Enhance help when running cron script from command line	2015-02-11 13:21:12 +01:00
Florian HENRY	e9bfa71556	syntax	2015-02-11 11:49:06 +01:00
Florian HENRY	db2dee7c03	syntax	2015-02-11 11:48:11 +01:00
Florian HENRY	db94860f76	syntax	2015-02-11 11:47:12 +01:00
Florian HENRY	73f1d10b72	syntax	2015-02-11 11:46:29 +01:00
Florian HENRY	7f5e4aa135	FIX : bug #1840 Email template modules in HTML are not render correctly	2015-02-11 11:44:49 +01:00
Laurent Destailleur	e3885d6d73	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/core/lib/tax.lib.php	2015-02-10 21:36:38 +01:00
Laurent Destailleur	ddb95e5765	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/comm/mailing/fiche.php htdocs/compta/paiement/liste.php htdocs/contact/class/contact.class.php htdocs/core/lib/tax.lib.php htdocs/core/modules/expedition/doc/pdf_merou.modules.php htdocs/core/modules/expedition/doc/pdf_rouget.modules.php htdocs/langs/en_US/agenda.lang htdocs/webservices/server_contact.php	2015-02-10 21:33:43 +01:00
Laurent Destailleur	039a184d70	Merge remote-tracking branch 'origin/3.5' into 3.6 Conflicts: htdocs/core/tpl/objectline_edit.tpl.php	2015-02-10 21:13:12 +01:00
Marcos García de La Fuente	e485dd413d	PHPDoc and misc fixes for several folders	2015-02-10 13:41:59 +01:00
Marcos García de La Fuente	530186c59d	PHPDoc and misc fixes for several folders	2015-02-10 13:32:00 +01:00
Marcos García de La Fuente	0d6d98b395	PHPDoc and misc fixes for several folders	2015-02-10 13:17:37 +01:00
phf	2a1a5e74c6	[CORE] mise à jour de l'objet pour l'info bulle après modification de l'incoterm (#incoterm).	2015-02-10 11:46:09 +01:00
phf	791bd7e9d9	[CORE] retrait la page de configuration et des tests sur la variable d'activation du module qui est inutile (#incoterm).	2015-02-10 11:45:23 +01:00
Marcos García de La Fuente	023175b9f1	PHPDoc and misc fixes for several folders	2015-02-10 11:38:13 +01:00
Marcos García de La Fuente	ca939bf8a5	PHPDoc and misc fixes for several folders	2015-02-10 11:02:11 +01:00
Marcos García de La Fuente	e21681a369	PHPDoc and misc fixes for Admin	2015-02-10 10:52:48 +01:00
Marcos García de La Fuente	157a6e109e	Misc Adherents PHPDoc corrections	2015-02-10 10:45:48 +01:00
Marcos García de La Fuente	0d150b1d32	Removed unused code, misc corrections and corrected PHPDoc problems.	2015-02-10 10:25:59 +01:00
phf	1701ecfd89	[CORE] fonction setIncoterms générique pour mettre à jour les valeurs de incotermsdes différentes tables (#incoterm).	2015-02-10 10:23:38 +01:00
phf	23751c75dc	[CORE] fin de la mise en place de la gestion incoterms des sociétés (#incoterm).	2015-02-10 10:22:38 +01:00
Marcos García de La Fuente	58a61e1294	Changed int typecast to float	2015-02-10 00:23:32 +01:00
Marcos García de La Fuente	949f9e40a0	Fix: [ bug #1832 ] SQL error when adding a product with no price defined to an object	2015-02-10 00:20:47 +01:00
phf	62762f82a9	[CORE] incorporation de l'ajout / modification de l'incoterm sur un tiers (#incoterm	2015-02-09 17:55:43 +01:00
KreizIT	2483d96b33	FIXED: #1829 POS not compatible with batch products	2015-02-09 17:19:20 +01:00
phf	c7e1528594	[CORE] initialisation de l'intégration du module incoterm au corp de dolibarr (#incoterm).	2015-02-09 15:53:19 +01:00
phf	65a3c75b04	[CORE] ajout des conditions dans la librairie pour le module (#new_ask_price).	2015-02-09 11:57:30 +01:00
phf	ffecdc13ff	[CORE] déplacement de la création des tables du module dans le script de migration (#new_ask_price).	2015-02-09 10:38:48 +01:00
phf	a1d2f426b8	[CORE] correction mineurs pour travis (#new_ask_price).	2015-02-09 10:17:28 +01:00
phf	34bc1dbc15	Merge branch 'develop' into new_ask_price	2015-02-09 09:07:50 +01:00
Laurent Destailleur	e8b2b22c32	Merge branch 'bug-1827' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-1827 Conflicts: ChangeLog	2015-02-07 23:56:38 +01:00
Laurent Destailleur	1314d9ce4e	Merge pull request #2311 from marcosgdf/bug-1810 Fix: [ bug #1810 ] [pgsql] Error while upgrading from 3.6 to 3.7	2015-02-07 23:41:48 +01:00
Laurent Destailleur	1d1b3da182	Fix: the syslog handler for chromphp an fiefoxphp was not visible when they should not.	2015-02-07 19:30:28 +01:00
Laurent Destailleur	64963ef9bd	Fix: the syslog handler for chromphp an fiefoxphp was not visible when they should not.	2015-02-07 19:12:22 +01:00
Laurent Destailleur	90fdc29d5e	Fix restore compatibility	2015-02-07 17:41:20 +01:00
aspangaro	71b9098a44	Fix : Typo on merge	2015-02-07 06:42:36 +01:00
Laurent Destailleur	3bdf8864a9	New: Add option MAXTABS_IN_CARD to limit number of visible tabs.	2015-02-07 04:24:31 +01:00
Laurent Destailleur	a21acdeb7c	Enable select2 for users combo	2015-02-07 03:41:09 +01:00
Laurent Destailleur	011d39105d	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/accountancy/admin/export.php htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/sellsjournal.php htdocs/core/datepicker.php htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php htdocs/fourn/facture/card.php	2015-02-07 03:28:36 +01:00
Laurent Destailleur	ba5d355eb3	Fix bad property	2015-02-07 02:14:45 +01:00
Laurent Destailleur	553181a5d9	Fixed: Location for file storage from tab attached files was not at same place than from tab images.	2015-02-06 21:26:41 +01:00
Laurent Destailleur	35129f2192	Fix PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS option not correctly supported. Fix: No limit on ldap search on dolibarr side.	2015-02-06 16:33:33 +01:00
Marcos García de La Fuente	b8b9df7b95	Fix: [ bug #1827 ] Tax reports gives incorrect amounts when using external modules that create lines with special codes	2015-02-06 12:36:09 +01:00
phf	bf643c26da	[CORE] FIX : des noms des hooks + correction nom de variable (#new_ask_price).	2015-02-06 09:50:27 +01:00
Laurent Destailleur	b654ffb627	New: Add option SUPPLIER_ORDER_HIDE_VALIDATED. So a module can remove this step. Useless when all users have permission to approve supplier orers.	2015-02-05 11:58:40 +01:00
phf	bcbf29d9a5	[CORE] assainissement du code + traductions FR vers EN (#new_ask_price).	2015-02-04 15:39:57 +01:00
phf	8bfb5839ca	[CORE] modification de l'affichage (#new_ask_price).	2015-02-03 16:53:09 +01:00
phf	7ae003fa1a	[CORE] modification de l'affichage (#new_ask_price).	2015-02-03 16:52:49 +01:00
phf	f15d18dbb1	[CORE] ajout d'une colonne pour la référence fournisseur sur une demande de prix (#new_ask_price).	2015-02-03 15:21:10 +01:00
Laurent Destailleur	4477a712d6	Fix: calendar was not using option START_WEEK.	2015-02-03 14:02:36 +01:00
Laurent Destailleur	a6e4fdd7c3	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-02-03 14:02:07 +01:00
Laurent Destailleur	0b01fa8eb8	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-02-03 13:45:10 +01:00
Laurent Destailleur	f865534b4c	Fix some pdf differences	2015-02-03 13:43:37 +01:00
Laurent Destailleur	7ac35593e1	Merge pull request #2314 from aspangaro/3.7-Accountancy FIXED Accountancy clean code	2015-02-03 13:11:16 +01:00
Laurent Destailleur	96215ccea5	Fix bad operator for and	2015-02-03 13:05:28 +01:00
Laurent Destailleur	41cabeee59	Fix pb into date management. Added phpunit to avoid this in future.	2015-02-03 12:40:49 +01:00
Laurent Destailleur	d626d073dc	Merge pull request #2304 from frederic34/tooltip Tooltip	2015-02-03 12:32:40 +01:00
Laurent Destailleur	fe674f8fd5	Fix pb into date management. Added phpunit to avoid this in future.	2015-02-03 12:21:30 +01:00
Laurent Destailleur	077fafdb7d	Remove log	2015-02-03 12:20:36 +01:00
Laurent Destailleur	01541e4152	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/comm/action/card.php htdocs/core/datepicker.php	2015-02-03 12:17:45 +01:00
Laurent Destailleur	20121c2fbe	Fix pb into date management. Added phpunit to avoid this in future.	2015-02-03 11:25:51 +01:00
phf	c22bbb23d8	[CORE] ré-indentation d'une ligne (#new_ask_price).	2015-02-03 10:09:25 +01:00
aspangaro	14a078c9a7	FIXED Accountancy clean code	2015-02-03 06:39:44 +01:00
Laurent Destailleur	21c78cc392	Merge remote-tracking branch 'origin/3.7' into develop	2015-02-02 21:45:31 +01:00
frederic34	f69e58cccb	Tooltip	2015-02-02 21:09:30 +01:00
Laurent Destailleur	9747f1fd2a	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into origin_dolibarr_develop	2015-02-02 18:38:24 +01:00
Laurent Destailleur	7b209fa0be	New: Add hidden option PDF_SHOW_PROJECT to show project ref onto supplier orders and invoices.	2015-02-02 18:36:49 +01:00
phf	5266542bc9	[CORE] correction bug + trad + ajout de conditions pour le fonctionnement du module (#new_ask_price).	2015-02-02 17:50:33 +01:00
Raphaël Doursenaud	fb865e8184	FIXED Removed deprecated forcing SSLv3 for CURL Since the Poodle vulnerability, SSLv3 has been supersedded by TLS. Many services do not offer SSLv3 anymore. CURL has also been patched in PHP so it now auto-negociates the most appropriate protocol. This prevented most API calls from working.	2015-02-02 17:13:11 +01:00
phf	d2c4e8c98f	[CORE] retrait d'une condition ajout auparavant mais qui est inutile (#new_ask_price).	2015-02-02 16:18:07 +01:00
phf	38551dd468	[CORE] retrait de liens ou champs inutile (#new_ask_price).	2015-02-02 16:17:07 +01:00
Laurent Destailleur	7fbf76ee2a	Fix phpcs	2015-02-02 15:43:22 +01:00
phf	a3c29f2e9c	[CORE] Avancement du fonctionnement du module, correction bug et épuration de l'affichage (#new_ask_price).	2015-02-02 15:41:14 +01:00
frederic34	482eec1cce	Merge remote branch 'upstream/develop' into tooltip	2015-02-02 13:48:39 +01:00
frederic34	fb22de1ecd	Merge remote branch 'upstream/develop' into tooltip	2015-02-02 13:46:52 +01:00
Laurent Destailleur	9c087e27d0	Fix permissions	2015-02-02 13:45:55 +01:00
Laurent Destailleur	7809013b96	Message is more clear.	2015-02-02 13:33:16 +01:00
Laurent Destailleur	3f042fb558	New: Introduce option PROJECT_HIDE_TASKS for people using project only as transversal analytic key and not to manage tasks.	2015-02-02 13:27:55 +01:00
Marcos García de La Fuente	a9ba2f3179	Fix: [ bug #1810 ] [pgsql] Error while upgrading from 3.6 to 3.7	2015-02-02 11:48:57 +01:00
phf	85a4df4ce2	[CORE] maj du pdf, champs PU HT et Total HT vide (#new_ask_price).	2015-02-02 10:06:36 +01:00
frederic34	3206957b99	Tooltip	2015-02-01 20:58:57 +01:00
Laurent Destailleur	52222ecdfe	Avoid tooltip into tooltip	2015-02-01 01:28:15 +01:00
Laurent Destailleur	34cbcad9da	Reduce number of new to save memory usage. Fight table to replace with div	2015-02-01 00:40:42 +01:00
Laurent Destailleur	3ec5b46864	Merge pull request #2294 from altatof/fix_fournprice_visibility FIX: always show fournprice select	2015-01-31 19:47:46 +01:00
Laurent Destailleur	ece70dbd2c	Merge pull request #2293 from frederic34/patch-4 Error message is ErrorCounterMustHaveMoreThan3Digits	2015-01-31 19:44:09 +01:00
Laurent Destailleur	c19ff003ea	Merge pull request #2292 from FHenry/develop_contract_line_extrafileds NEW: contract lines extrafileds	2015-01-31 19:43:37 +01:00
Laurent Destailleur	6976aec04b	Merge pull request #2289 from accett/patch-2 Currency symbol in Mexico	2015-01-31 19:40:57 +01:00
Laurent Destailleur	963b9e8583	Merge remote-tracking branch 'origin/3.7' into develop	2015-01-31 19:37:25 +01:00
Laurent Destailleur	9188be57ce	Select2 component creates problem of sizing with jmobile.	2015-01-31 19:25:26 +01:00
Laurent Destailleur	2788a352cf	Missing lang loading	2015-01-31 19:00:00 +01:00
Laurent Destailleur	13019f1f33	Clean code introduced by last PR.	2015-01-31 17:02:36 +01:00
Laurent Destailleur	d32f52cc50	Fix date of delivery, and avoid duplicate tracking number.	2015-01-31 16:23:23 +01:00
Laurent Destailleur	1e72d49858	Merge pull request #2286 from accett/patch-1 New: Introduce num to text function and use sign before amout for mexico currency	2015-01-31 15:55:16 +01:00
Laurent Destailleur	d66d4f53a5	Merge branch 'tooltip' of https://github.com/frederic34/dolibarr into frederic34-tooltip Conflicts: htdocs/core/boxes/box_produits.php htdocs/core/boxes/box_produits_alerte_stock.php htdocs/product/index.php	2015-01-31 15:41:33 +01:00
Laurent Destailleur	1c7feb67ea	Merge branch 'dinamic-prices-product' of https://github.com/IonAgorria/dolibarr into IonAgorria-dinamic-prices-product Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql htdocs/product/fournisseurs.php	2015-01-31 14:53:14 +01:00
Laurent Destailleur	770ddb6b0f	Merge branch 'task-1793' of https://github.com/marcosgdf/dolibarr into marcosgdf-task-1793 Conflicts: ChangeLog htdocs/margin/lib/margins.lib.php	2015-01-31 14:29:15 +01:00
Laurent Destailleur	ce8ad39a8e	Remove test code and restore prod code.	2015-01-31 13:00:51 +01:00
frederic34	6a1865adb6	Merge remote branch 'upstream/develop' into tooltip Conflicts: htdocs/fourn/commande/list.php	2015-01-31 09:58:41 +01:00
Laurent Destailleur	275e198041	New: Selection of project use the new select2 component.	2015-01-30 19:57:38 +01:00
frederic34	b850b7b448	Merge remote branch 'upstream/develop' into tooltip Conflicts: htdocs/langs/en_US/sendings.lang	2015-01-30 16:45:24 +01:00
frederic34	736bee565c	Tooltip everywhere	2015-01-30 16:40:33 +01:00
Laurent Destailleur	291340a39f	Merge remote-tracking branch 'origin/3.7' into develop	2015-01-30 16:34:18 +01:00
Laurent Destailleur	59711298c3	Fixed: Length of project label is no more truncated on element cards (invoice, proposal, order...)	2015-01-30 16:33:39 +01:00
Laurent Destailleur	d6dc495a42	Removed bad print	2015-01-30 16:01:56 +01:00
Laurent Destailleur	4fdc287717	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/accountancy/customer/card.php htdocs/accountancy/journal/sellsjournal.php htdocs/admin/menus.php htdocs/fourn/commande/card.php htdocs/install/check.php	2015-01-30 15:53:06 +01:00
Laurent Destailleur	67c1ae8593	Fixed: condition to show menus	2015-01-30 15:47:27 +01:00
phf	aba3ec0612	[CORE] modification de l'affiche du PDF (#new_ask_price).	2015-01-29 12:26:50 +01:00
phf	4408828af4	[CORE] ajouts des conditions pour le fonctionnement avec le module (#new_ask_price).	2015-01-29 12:13:06 +01:00
phf	2f8ceea587	[CORE] renomage de variables pour le module + modification de traductions (#new_ask_price).	2015-01-29 12:12:22 +01:00
phf	3743745cd8	[CORE] maj mineur (#new_ask_price).	2015-01-29 10:44:23 +01:00
phf	a58899d354	[CORE] ajout d'une condition pour le fonctionnement du module (#new_ask_price).	2015-01-29 10:41:08 +01:00
Laurent Destailleur	ad6af14edd	Fixed: Status was not visible if selected.	2015-01-28 19:27:56 +01:00
phf	5da4d0262e	[CORE] ajouts des conditions nécessaire pour l'intégration du module (#new_ask_price).	2015-01-28 17:28:44 +01:00
phf	a98ce01807	[CORE] renomage de masse + correction des noms des fichiers/fonctions par copie + ajout de clés de traductions (#new_ask_price).	2015-01-28 17:27:26 +01:00
Christophe Battarel	04f83ae4ff	FIX: always show fournprice select	2015-01-28 16:19:56 +01:00
phf	c5398f61f9	[CORE] Modif de trad et renomage pour le module askpricesupplier (#new_ask_price).	2015-01-28 15:37:52 +01:00
phf	3644f4c84c	[CORE] renomage de masse (#new_ask_price).	2015-01-28 14:48:59 +01:00
phf	a9d26efee8	[CORE] ajout des conditions pour un element de type askpricesupplier (#new_ask_price).	2015-01-28 14:44:48 +01:00
phf	ec621244f3	[CORE] ajouts des conditions spécifiques pour les appels depuis l'objet AskPriceSupplier (#new_ask_price).	2015-01-28 14:34:27 +01:00
phf	903f739449	[CORE] avancement du mercredi matin (#new_ask_price).	2015-01-28 10:33:15 +01:00
Frédéric FRANCE	a560b582f5	Update functions2.lib.php	2015-01-28 00:02:57 +01:00
phf	49fa0056c8	[CORE] Avancement des replace (#new_ask_price).	2015-01-27 17:43:07 +01:00
phf	aaacca9b13	[CORE] première partie des grosses modifications (#new_ask_price).	2015-01-27 16:53:27 +01:00
Florian HENRY	a510a1ef5c	First step add contract lines extrafields	2015-01-27 12:53:02 +01:00
AcceTT Soluciones Computacionales	608b099934	Currency symbol in Mexico I tried to change the order of the currency symbol in Mexico is before.	2015-01-26 21:38:43 -06:00
Maxime Kohlhaas	11dd32a8fd	FIXED Import module was not working with multi-company and importing everything in entity 1	2015-01-26 23:37:25 +01:00
accett	62ae75b3bf	Update for Mexico Users Add MXN in the array for countries use the sign currency before. (Mexico does). Add function float2text_moneda to convert the number in the text form for tickets, facture, proposals, etc.	2015-01-26 14:38:02 -06:00
phf	6fee87ca56	[CORE] ajout en commentaire de la requete sql de creation de table (#new_ask_price).	2015-01-26 17:35:37 +01:00
phf	60be0193b0	[CORE] Initialisation global du module askpricesupplier (#new_ask_price).	2015-01-26 17:21:35 +01:00
Laurent Destailleur	ffde00de81	Fixed date change was lost when changing event assignement.	2015-01-26 10:31:41 +01:00
Laurent Destailleur	da9f13bca9	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-01-25 22:30:05 +01:00
Laurent Destailleur	57c84089fe	Introduce warning to remind to do a backup before migration. Required because we discovered, during beta, serious bugs into some databases system loosing data.	2015-01-25 22:29:36 +01:00
Laurent Destailleur	dfc0ab7bfb	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-01-25 22:00:59 +01:00
Laurent Destailleur	b61c475aa8	Clean code for validate permissions. "validate" is a status to say, "now it exists, it is no more a draft", so by default we don't need this permissions (it is same than create). We keep "validate" permissions as an "advanced" permission only.	2015-01-25 21:32:40 +01:00
Laurent Destailleur	0647c49067	Merge pull request #2274 from aschio/develop New: Added Extrafields for Supplier invoice lines and Supplier order lines	2015-01-25 19:21:03 +01:00
Laurent Destailleur	b926a77325	Merge pull request #2280 from aspangaro/3.7-Accountancy FIXED Accounting module - Align integrate core version & module version 3.6	2015-01-25 17:53:17 +01:00
Laurent Destailleur	3ebaaa38d2	Fixed: Management of option SERVICE_ARE_ECOMMERCE_200238EC	2015-01-25 16:04:37 +01:00
aspangaro	ae11ab12f6	FIXED Accounting module - Align core & module 3.6	2015-01-25 06:54:17 +01:00
Laurent Destailleur	ad68b3ca6c	Fixed approve during validation if user has permission Fixed error management Fixed rendering country must be same for all tabs.	2015-01-25 00:59:46 +01:00
frederic34	e18577aa62	Tooltip and lib for file cache	2015-01-24 21:46:05 +01:00
Laurent Destailleur	568d5cb5ba	Fixed: Tracking number restored on PDF shipments Fixed: Translation Conflicts: htdocs/langs/en_US/agenda.lang	2015-01-23 18:47:47 +01:00
Laurent Destailleur	a4990a58b1	The badge was missing for shipment	2015-01-23 18:39:40 +01:00
Laurent Destailleur	083cf06908	Fixed: Tracking number restored on PDF shipments Fixed: Translation	2015-01-23 18:33:33 +01:00
frederic34	925aa2039b	Tooltip and cache for boxes	2015-01-23 10:51:12 +01:00
Laurent Destailleur	6bda61436b	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: dev/codesniffer/ruleset.xml htdocs/core/class/html.formfile.class.php htdocs/core/lib/functions2.lib.php htdocs/projet/element.php	2015-01-22 21:52:55 +01:00
Laurent Destailleur	0f7238937a	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/fourn/commande/fiche.php	2015-01-22 18:55:26 +01:00
cla	6dfd5b1fac	Added extrafields features for Supplier Invoice Line and Supplier Order Line	2015-01-22 14:15:34 +01:00
Laurent Destailleur	4bb86717cf	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2015-01-22 12:30:18 +01:00
Laurent Destailleur	31be2563c2	Fixed: Allow external module a chance to fix regression.	2015-01-22 12:29:55 +01:00
frederic34	12c8d4ba1f	Merge remote branch 'upstream/develop' into tooltip	2015-01-22 00:44:50 +01:00
frederic34	f4161b457b	Add dol_escape_htmltag and start to adapt boxes	2015-01-22 00:23:55 +01:00
frederic34	1b0dd671b3	Add tooltip in getNomUrl link	2015-01-20 21:40:33 +01:00
Frédéric FRANCE	3ab6ac601e	Type of supplier invoice was broken	2015-01-20 17:55:20 +01:00
jean	b809f0aeb8	Merge remote-tracking branch 'origin/3.6' into 3.6	2015-01-20 17:31:17 +01:00
jean	5ec0b32ab0	add left joins on llx_c_actiocomm	2015-01-20 17:26:32 +01:00
Laurent Destailleur	e14684c417	Merge pull request #2259 from marcosgdf/misc-fixes misc-fixes	2015-01-19 15:28:28 +01:00
Florian HENRY	ab50437331	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop Conflicts: htdocs/comm/action/class/actioncomm.class.php htdocs/compta/facture/class/facture.class.php htdocs/core/class/html.form.class.php	2015-01-19 09:38:00 +01:00
Laurent Destailleur	f96fdc7d0a	Regression solved	2015-01-18 21:04:39 +01:00
Laurent Destailleur	e220ce5a82	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/comm/card.php htdocs/comm/propal.php htdocs/commande/card.php htdocs/compta/facture.php htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/core/class/html.formcompany.class.php htdocs/custom/.gitignore htdocs/expedition/card.php htdocs/fourn/card.php htdocs/product/fournisseurs.php	2015-01-18 18:44:22 +01:00
Laurent Destailleur	5c5ff72ecd	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: ChangeLog htdocs/adherents/fiche.php htdocs/comm/fiche.php htdocs/comm/mailing/fiche.php htdocs/comm/propal.php htdocs/comm/propal/class/propal.class.php htdocs/commande/class/commande.class.php htdocs/commande/fiche.php htdocs/compta/facture.php htdocs/compta/paiement.php htdocs/core/class/html.formcompany.class.php htdocs/core/tpl/login.tpl.php htdocs/expedition/fiche.php htdocs/fourn/commande/fiche.php htdocs/fourn/facture/fiche.php htdocs/fourn/facture/paiement.php htdocs/fourn/fiche.php htdocs/main.inc.php htdocs/product/fournisseurs.php htdocs/resource/card.php	2015-01-18 17:13:42 +01:00
Marcos García de La Fuente	c667f8734a	[ task #1793 ] Create new permission to restrict commercial agent margin to logged user	2015-01-18 16:42:11 +01:00
Marcos García de La Fuente	55b8c28100	Corrected weird typo	2015-01-18 16:28:42 +01:00
Florian HENRY	b171975d18	Fix travis	2015-01-18 16:08:10 +01:00
Florian HENRY	22c253cfc1	add extrafield type, check box from table	2015-01-18 16:02:31 +01:00
Laurent Destailleur	7b7b8f376f	Merge branch 'bug-1784' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-1784 Conflicts: ChangeLog	2015-01-18 15:13:26 +01:00
Laurent Destailleur	d1e2ab6f56	Merge branch 'bug-1783' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-1783 Conflicts: ChangeLog	2015-01-18 15:10:30 +01:00
Laurent Destailleur	c35de1aa06	Merge branch 'bug-1803' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-1803 Conflicts: ChangeLog	2015-01-18 15:01:18 +01:00
Laurent Destailleur	3db231cea6	Merge pull request #2232 from defrance69/patch-43 Update commondocgenerator.class.php	2015-01-18 13:45:50 +01:00
Laurent Destailleur	34fe87536b	Merge pull request #2137 from frederic34/printipp Printing System which may accept modules	2015-01-18 13:09:41 +01:00
Laurent Destailleur	b1f889e1d1	Merge remote-tracking branch 'origin/3.5' into 3.6	2015-01-18 12:46:23 +01:00
Frédéric FRANCE	f3a3136452	Update html.form.class.php	2015-01-18 11:38:45 +01:00
Marcos García de La Fuente	71e5cf07c6	Fix: [ bug #1735 ] Rights to delete expense notes no longer there - cannot delete expense notes	2015-01-18 03:12:46 +01:00
Marcos García de La Fuente	78905c6af1	Fix: [ bug #1784 ] « Message page de connexion » n'apparaît pas	2015-01-17 20:29:51 +01:00
Marcos García de La Fuente	dacec491ff	Fix: [ bug #1783 ] SQL error when enabling 3rd party module with PostgreSQL and MySQL strict mode ON	2015-01-17 19:37:49 +01:00
Laurent Destailleur	1664b89cef	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-01-17 19:26:19 +01:00
Marcos García de La Fuente	068045f6a0	Fix: [ bug #1803 ] AJAX company contact input is not aligned	2015-01-17 18:23:20 +01:00
Laurent Destailleur	9876b30387	Need more info to find bugs	2015-01-17 16:22:37 +01:00
Laurent Destailleur	007f18bcf7	Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into GPCsolutions-review Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/cashjournal.php htdocs/accountancy/journal/purchasesjournal.php htdocs/comm/action/peruser.php htdocs/core/class/html.form.class.php htdocs/core/lib/accounting.lib.php htdocs/core/lib/report.lib.php	2015-01-17 15:11:12 +01:00
Laurent Destailleur	eeeb6de8d9	Merge pull request #2020 from GPCsolutions/situationsinvoices Situations invoices support	2015-01-17 14:44:05 +01:00
Laurent Destailleur	30abacd0a6	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2015-01-17 14:42:42 +01:00
Laurent Destailleur	87a59ef527	Merge branch 'develop_bank_extrafields' of https://github.com/FHenry/dolibarr into FHenry-develop_bank_extrafields Conflicts: htdocs/admin/bank.php	2015-01-17 14:42:04 +01:00
Laurent Destailleur	8cd46e4830	Introduce option MAIN_HTML_TITLE to start to control format of html title content.	2015-01-17 14:34:16 +01:00
Laurent Destailleur	41890d0a0b	Fixed: Translation of module name and desc was not used for external modules.	2015-01-16 14:38:00 +01:00
Laurent Destailleur	c5df4fd9b8	Merge pull request #2240 from genezys/develop Add support for configurable first day of week	2015-01-16 12:09:21 +01:00
Laurent Destailleur	6a081fe883	Merge pull request #2229 from frederic34/getnextvalue Translation error messages numbering modules	2015-01-16 12:08:53 +01:00
Laurent Destailleur	c54355b63a	Merge remote-tracking branch 'origin/3.7' into develop	2015-01-16 10:44:41 +01:00
Vincent Robert	eb90e0124e	Add support for configurable first day of week - Force loading of database configuration to retrieve the first day of week - Order the day titles based on first day of week - Change layout based on first day of week Conflicts: htdocs/core/datepicker.php	2015-01-15 12:43:13 +01:00
Laurent Destailleur	e20c1decdf	Fixed: object instead of soc and vis versa.	2015-01-15 03:51:47 +01:00
Laurent Destailleur	ba49cce47a	Fix: The filter into event views on user must be done on assigned resource, not only owner.	2015-01-15 02:06:04 +01:00
Laurent Destailleur	68441a563a	Fixed: Avoid space into address string	2015-01-14 19:17:58 +01:00
Laurent Destailleur	a2c9d5bd4a	Fixed balance of td introduced by MAX_TAB option.	2015-01-14 19:10:21 +01:00
Laurent Destailleur	e10b5637d4	Fixed: Avoid spaces into address string	2015-01-14 18:54:56 +01:00
Laurent Destailleur	806477977d	Fix: css	2015-01-14 13:51:21 +01:00
Laurent Destailleur	f92bc7986b	Add Weighted average price as default price for buying price for margin calculation. Add option MARGIN_PMP_AS_DEFAULT_BUY_PRICE to replace with first supplier price.	2015-01-14 10:46:50 +01:00
Laurent Destailleur	a886136e67	More comment and add a unit test to check that {t} tag is correctly supported.	2015-01-13 22:13:15 +01:00
Laurent Destailleur	033e77c04a	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/product/stock/product.php	2015-01-13 15:41:45 +01:00
Laurent Destailleur	8b3faf46db	Add PMP into selection of buy price.	2015-01-13 15:38:59 +01:00
Marcos García de La Fuente	4da52cf733	Fix: [ bug #1797 ] Tulip Supplier invoice module takes creation date instead of invoice date	2015-01-13 11:11:37 +01:00
BENKE Charles	e07bb07bab	Update commondocgenerator.class.php add extrafield on odt lines	2015-01-12 18:18:43 +01:00
Laurent Destailleur	f8b58605c6	Better organisation of entries into security setup area	2015-01-12 13:21:16 +01:00
Laurent Destailleur	13132ef2ed	Better organisation of entries into security setup area	2015-01-12 13:20:27 +01:00
frederic34	173d3aaa90	Translation error messages numbering modules	2015-01-11 11:31:53 +01:00
Laurent Destailleur	e4b89779f7	Fixed: css conflict	2015-01-10 21:39:40 +01:00
Laurent Destailleur	c441aa89db	Fixed: Avoid warning	2015-01-10 18:19:44 +01:00
Laurent Destailleur	fc78d632d3	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/compta/facture.php htdocs/contrat/class/contrat.class.php htdocs/core/lib/company.lib.php htdocs/core/lib/functions.lib.php htdocs/main.inc.php	2015-01-09 23:09:10 +01:00
fentman	9049931ff0	Change to $listofcurrenciesbefore for GBP + AUD Update of functions.lib.php - function price() $listofcurrenciesbefore to include USD, GBP, and AUD to support $ and £ appearing before amounts on invoices not after the amount	2015-01-09 22:55:17 +01:00
Laurent Destailleur	027c9c4d98	Merge pull request #2226 from fentman/patch-1 Change to $listofcurrenciesbefore for GBP + AUD	2015-01-09 22:54:37 +01:00
Laurent Destailleur	e24a668c52	Merge pull request #2225 from frederic34/psr2 Psr2	2015-01-09 22:53:06 +01:00
frederic34	60661ae948	Add some "classfortooltip"	2015-01-09 00:07:54 +01:00
frederic34	73fda2cb86	WIP PSR2	2015-01-08 18:36:03 +01:00
fentman	742ec954cd	Change to $listofcurrenciesbefore for GBP + AUD Update of functions.lib.php - function price() $listofcurrenciesbefore to include USD, GBP, and AUD to support $ and £ appearing before amounts on invoices not after the amount	2015-01-08 11:21:25 +11:00
Raphaël Doursenaud	50c2b75ef8	Invoices: added situation (or interim) invoices support	2015-01-06 17:12:13 +01:00
Laurent Destailleur	443c9d245e	Merge pull request #2212 from marcosgdf/misc-doc Miscellaneous corrections	2015-01-06 00:21:05 +01:00
Laurent Destailleur	908a95d83f	Merge pull request #2211 from marcosgdf/contract-fixes Several Contract-related fixes	2015-01-06 00:18:51 +01:00
Laurent Destailleur	ce1cad2801	Merge pull request #2207 from frederic34/patch-3 Enhance select_categories with select2	2015-01-06 00:17:43 +01:00
Laurent Destailleur	6916fffbe2	Merge pull request #2197 from frederic34/patch-5 Attribut width not allowed with div or span	2015-01-06 00:08:08 +01:00
Laurent Destailleur	6a6c5c54f1	Merge pull request #2220 from aspangaro/3.7-Auguria Add module accountancy expert in auguria menu	2015-01-06 00:07:26 +01:00
aspangaro	b4b5b35afa	Skype :: Better presentation	2015-01-04 20:17:49 +01:00
aspangaro	f14ea7b649	Add module accountancy expert in auguria menu	2015-01-03 15:07:54 +01:00
philippe grand	96e6c66365	better translation and typo	2015-01-01 11:24:00 +01:00
Laurent Destailleur	be34fcfa8a	Removed duplicate link making same thing	2014-12-30 21:33:56 +01:00
Laurent Destailleur	baa247ea86	Fixed: doxygen	2014-12-30 21:24:57 +01:00
Laurent Destailleur	d72d056e02	Enhance look for contacts forms of thirdparties.	2014-12-30 21:04:02 +01:00
Laurent Destailleur	8abbac564b	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/filefunc.inc.php htdocs/main.inc.php	2014-12-30 04:28:09 +01:00
Marcos García de La Fuente	86100758ff	Miscellaneous corrections	2014-12-28 20:13:15 +01:00
Marcos García de La Fuente	ef4d710f78	Improving CommonObject and Contrat documentation	2014-12-28 19:16:14 +01:00
Marcos García de La Fuente	df1f931ab8	Fixed: [ bug #1767 ] Contract document is not generated properly	2014-12-28 18:10:41 +01:00
Frédéric FRANCE	56dd276504	Enhance search_categories with select2	2014-12-28 15:17:54 +01:00
frederic34	9c2c338dc0	Typo on variable	2014-12-28 14:21:54 +01:00
frederic34	e937039596	Merge remote branch 'upstream/develop' into printipp	2014-12-28 11:59:58 +01:00
Ion Agorria	5bbcb58b44	Added expressions for product/service prices	2014-12-28 01:26:41 +01:00
Frédéric FRANCE	dc18759c6c	Attribut width not allowed with div or span	2014-12-27 11:15:26 +01:00
Laurent Destailleur	29db4d4670	Merge pull request #2194 from atm-maxime/develop in PDF, no line jump after doc linked ref. Fix bug 1605.	2014-12-26 22:07:55 +01:00
Laurent Destailleur	5d80061caf	Mark property error as deprecated	2014-12-26 22:04:16 +01:00
Marcos García de La Fuente	9f6f90275a	Fix [ bug #1714 ] Id "sall" is used twice in different HTML tags	2014-12-26 12:03:29 +01:00
Maxime Kohlhaas	e7ebb78ffd	in PDF, no line jump after doc linked ref. Fix bug 1605.	2014-12-26 11:09:46 +01:00
Laurent Destailleur	d8557d8af0	Fixed: label	2014-12-26 05:16:00 +01:00
Laurent Destailleur	5ead994955	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: ChangeLog	2014-12-26 04:57:55 +01:00
Laurent Destailleur	657fc1b91c	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: ChangeLog htdocs/comm/fiche.php htdocs/core/lib/functions2.lib.php htdocs/fourn/fiche.php htdocs/langs/fr_FR/compta.lang htdocs/projet/element.php htdocs/projet/tasks/contact.php htdocs/projet/tasks/time.php	2014-12-26 04:44:15 +01:00
Laurent Destailleur	d18770c1e7	Merge remote-tracking branch 'origin/3.5' into 3.6	2014-12-26 04:16:08 +01:00
Laurent Destailleur	77e48f8c3e	Merge branch 'bug-1768' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-1768	2014-12-26 04:12:58 +01:00
Laurent Destailleur	3c500158a9	Merge pull request #2187 from marcosgdf/bug-1715 Fix [ bug #1715 ] Valign and width attributes are used in div tags	2014-12-26 04:02:46 +01:00
Laurent Destailleur	5215b1e641	Merge pull request #2186 from marcosgdf/bug-575 Fix [ bug #575 ] GED doesn't works if there is "/" in a mask	2014-12-26 04:02:01 +01:00
Laurent Destailleur	bba8653179	Merge pull request #2183 from marcosgdf/bug-1724 Fix: [ bug #1724 ] Can't add a submenu to projects	2014-12-26 03:50:36 +01:00
Laurent Destailleur	54437703fb	Merge pull request #2177 from frederic34/patch-7 Enhance select_salesrepresentatives with select2	2014-12-26 03:49:43 +01:00
Marcos García de La Fuente	1d39c1acc2	Fix: [ bug #1768 ] PHP Warning when error connecting to a PostgreSQL server in install script	2014-12-26 00:12:16 +01:00
Marcos García de La Fuente	f4def9ea28	Fix: [ bug #1769 ] Error when installing to a PostgreSQL DB that contains numbers	2014-12-26 00:07:24 +01:00
Marcos García de La Fuente	2616deb58d	Copyright info	2014-12-25 22:52:11 +01:00
Marcos García de La Fuente	eb524cfd29	Copyright info	2014-12-25 22:50:33 +01:00
Marcos García de La Fuente	7b6a4d1bfd	Fix: [ bug #1715 ] Valign and width attributes are used in div tags	2014-12-25 22:50:15 +01:00
Marcos García de La Fuente	1f00794c98	Fixed bug which didn't show documents in auto GED when an object had '/' in its ref	2014-12-25 21:47:39 +01:00
Marcos García de La Fuente	146bba90e7	Fix: [ bug #1724 ] Can't add a submenu to projects	2014-12-25 18:42:26 +01:00
Laurent Destailleur	40404530ba	Fixed: [ bug #1756 ] PHP error while removing an import profile	2014-12-25 12:09:00 +01:00
Laurent Destailleur	bd7f6339ce	Because this is a legal issue (OPCA), i added the hidden constant for 3.7: WORKFLOW_PROPAL_CAN_CLASSIFY_BILLED_WITHOUT_INVOICES => Button "Classified Billed" is visible on proposal even if there is no invoice linked to proposal. Fixed: Also fix get list of invoice that report too many data.	2014-12-25 12:08:35 +01:00
Marcos García de La Fuente	1179f722af	Merge branch '3.7' into bug-1533	2014-12-25 01:26:00 +01:00
Juanjo Menent	65eef3587a	Merge pull request #2166 from defrance69/patch-36 Update functions.lib.php	2014-12-24 15:38:48 +01:00
Marcos García de La Fuente	ee1bc22e79	Fix: [ bug #1722 ] Missing link in homepage project's box	2014-12-24 14:42:47 +01:00
Juanjo Menent	f60d7ea2de	Merge pull request #2176 from marcosgdf/bug-1722 Fix: [ bug #1722 ] Missing link in homepage project's box	2014-12-24 14:41:47 +01:00
Marcos García de La Fuente	294753dc47	Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks Conflicts: htdocs/core/lib/functions2.lib.php	2014-12-24 14:32:25 +01:00
Marcos García de La Fuente	b68276637b	Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks Conflicts: htdocs/core/lib/functions2.lib.php	2014-12-24 14:31:17 +01:00
Frédéric FRANCE	d03cc03cd7	Enhance select_salesrepresentatives with select2	2014-12-23 16:42:05 +01:00
Marcos García de La Fuente	034455fc2d	Fix: [ bug #1722 ] Missing link in homepage project's box	2014-12-23 16:37:53 +01:00
Laurent Destailleur	acf7b9f130	Because this is a legal issue (OPCA), i added the hidden constant for 3.7: WORKFLOW_PROPAL_CAN_CLASSIFY_BILLED_WITHOUT_INVOICES => Button "Classified Billed" is visible on proposal even if there is no invoice linked to proposal. Fixed: Also fix get list of invoice that report too many data.	2014-12-23 12:59:34 +01:00
Laurent Destailleur	e8addcb8ba	Fixed: [ bug #1756 ] PHP error while removing an import profile	2014-12-23 12:25:21 +01:00
Marcos García de La Fuente	8a14409974	Fix: [ bug #1533 ] Links triggers do not show trigger error message	2014-12-23 11:39:43 +01:00
Marcos García de La Fuente	46fe2c67e0	Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks	2014-12-22 22:32:05 +01:00
BENKE Charles	b45bd06475	Update functions.lib.php Add feature to limit the number of tabs in a card (based on google menu practice) function actived with MAXTABS_IN_CARD dictionnary watch result here : http://www.dolibarr.fr/forum/12-howto--aide/52135-tuto-ajouter-a-un-doc-pdf-un-extrafields#56008 or here. All the code is in one function, need to explode/refactoring it on diferent css	2014-12-22 12:26:04 +01:00
Laurent Destailleur	2a3bb96c34	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/core/class/html.form.class.php htdocs/core/lib/ecm.lib.php	2014-12-22 03:14:22 +01:00
Laurent Destailleur	1dc2bbb0f1	Fixed: Var no declared	2014-12-22 03:01:31 +01:00
Laurent Destailleur	90d275bd20	Fix comment	2014-12-22 02:53:55 +01:00
frederic34	3bf63ed0a9	Merge remote branch 'upstream/develop' into printipp	2014-12-21 14:59:37 +01:00
Laurent Destailleur	31f782ffe9	Fix: Several fixes into tasks and time spent management	2014-12-21 14:58:18 +01:00
Laurent Destailleur	22c27e8703	PHPCS	2014-12-21 02:21:12 +01:00
Laurent Destailleur	268723be7b	Fixed: sql syntax error	2014-12-21 01:39:20 +01:00
Laurent Destailleur	74d5e11831	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2014-12-20 15:42:30 +01:00
Laurent Destailleur	8996953077	Fix: error reported by scrutinizer	2014-12-20 15:42:03 +01:00
Laurent Destailleur	cea500ef80	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/core/class/html.form.class.php htdocs/core/lib/ajax.lib.php	2014-12-20 13:06:08 +01:00
Laurent Destailleur	c9f3267649	Fixed: bad conditions	2014-12-20 11:34:37 +01:00
Laurent Destailleur	27f26bba27	Fixed: Missing test	2014-12-20 11:17:04 +01:00
Laurent Destailleur	854ed90a62	Fixed: bad place for the ajaxcombo.	2014-12-20 11:15:10 +01:00
Laurent Destailleur	beaec59ab6	PHPCS	2014-12-20 00:29:53 +01:00
Laurent Destailleur	4769e26d8e	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: ChangeLog	2014-12-18 12:34:41 +01:00
Laurent Destailleur	ef5035b349	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: htdocs/core/class/commonobject.class.php htdocs/product/liste.php	2014-12-18 11:42:55 +01:00
Laurent Destailleur	2c01a46774	Merge remote-tracking branch 'origin/3.5' into 3.6 Conflicts: htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php htdocs/paypal/lib/paypal.lib.php	2014-12-18 10:13:25 +01:00
Laurent Destailleur	d9aba405dd	Fix: utf must be default value.	2014-12-18 10:09:47 +01:00
Laurent Destailleur	f5da9b5e33	Merge pull request #2149 from altatof/3.5 FIX: dont put a mess with date and datetime extrafield value if already in right format	2014-12-18 10:04:03 +01:00
Laurent Destailleur	6728ad3c37	Merge pull request #2148 from altatof/fixhook FIX: hook insertExtraFields must return a returnvalue (0,1,-1)	2014-12-18 10:03:32 +01:00
Laurent Destailleur	4887f51174	Merge pull request #2158 from altatof/fix_fichinter_pdf_pagebreak FIX: pagebreak on fichinter like in other documents	2014-12-18 10:02:25 +01:00
Laurent Destailleur	52b64f3441	CSS	2014-12-17 13:27:44 +01:00
Christophe Battarel	c9f69279c7	FIX: pagebreak on fichinter like in other documents	2014-12-16 16:21:31 +01:00
Laurent Destailleur	0cd29b3343	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-12-15 23:24:47 +01:00
Laurent Destailleur	a8c6417604	Merge remote-tracking branch 'origin/3.7' into develop	2014-12-15 10:33:14 +01:00
Laurent Destailleur	0b6ff8f9bc	Fix: Debug of feature PRODUIT_CUSTOMER_PRICES_BY_QTY. Dev seems to not be finished. We keep it as development status.	2014-12-14 20:41:11 +01:00
Laurent Destailleur	711b033844	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/contrat/card.php htdocs/core/class/html.form.class.php htdocs/product/stock/card.php	2014-12-14 12:35:13 +01:00
Christophe Battarel	27b47a4f48	FIX: dont put a mess with date and datetime extrafield value if already in right format (the bug was in propale/order/invoice extrafields, mainly visible with 2 datetime extrafields)	2014-12-12 14:31:36 +01:00
Christophe Battarel	a1bba472a0	FIX: hook insertExtraFields must return a returnvalue (0,1,-1)	2014-12-12 11:57:20 +01:00
frederic34	df28ce77c0	Some progress on Printing	2014-12-11 21:58:56 +01:00
Laurent Destailleur	a0112ba724	Better position of elements	2014-12-11 21:38:53 +01:00
Laurent Destailleur	c994fbe44d	Fixed: Bad style	2014-12-11 14:31:47 +01:00
Laurent Destailleur	67cf3cb99b	Fixed: BIC/SWIFT and IBAN must be at same level	2014-12-11 10:13:44 +01:00
Laurent Destailleur	b7c476d339	Merge pull request #2139 from frederic34/patch-3 Use same size for select_produits_fournisseur and select_produits	2014-12-10 11:30:57 +01:00
Laurent Destailleur	7834a9b099	Add hidden constant to solve bug of too low size to see products label.	2014-12-10 00:51:57 +01:00
frederic34	608f4a7d7d	Some correct html	2014-12-09 23:37:04 +01:00
Frédéric FRANCE	9f1ec0e710	Update html.form.class.php	2014-12-09 20:52:55 +01:00
Frédéric FRANCE	66f634f217	Update functions.lib.php	2014-12-09 20:47:54 +01:00
Frédéric FRANCE	6a01b6982e	Update html.form.class.php	2014-12-09 20:20:52 +01:00
Frédéric FRANCE	590618eb38	Update functions.lib.php	2014-12-09 20:17:13 +01:00
Frédéric FRANCE	34b42ba798	Truncate label different for small or big screen	2014-12-09 18:47:12 +01:00
Frédéric FRANCE	8cae2f1448	Use same size for select_produits_fournisseur and select_produits	2014-12-09 16:21:44 +01:00
Laurent Destailleur	6a70af2b67	Fixed: bug into produc batch management	2014-12-09 14:03:10 +01:00
aspangaro	81dc1415de	Untranslatable token in activity box	2014-12-09 05:04:39 +01:00
aspangaro	666e66e78f	Correct link in activity box	2014-12-09 05:04:12 +01:00
frederic34	6b4d7b973b	Some changes	2014-12-08 23:30:17 +01:00
frederic34	16d860b3f7	Lang Correction	2014-12-08 22:17:28 +01:00
frederic34	715d0f18db	Lang correction	2014-12-08 21:52:53 +01:00
frederic34	9bb1999dc2	Some correct	2014-12-08 21:07:24 +01:00
frederic34	295fe115ab	Merge remote branch 'upstream/develop' into printipp	2014-12-08 20:33:50 +01:00
frederic34	be60c13de6	WIP Printing System	2014-12-08 20:33:26 +01:00
Laurent Destailleur	a8052d8ea4	Fixed: Several fix in color management (function at wrong place, mark param that are deprecated, convertion of value to get correct format in all situation)	2014-12-08 19:12:27 +01:00
Laurent Destailleur	0ea7d51b22	Fixed: Several fix in color management (function at wrong place, mark param that are deprecated, convertion of value to get correct format in all situation)	2014-12-08 19:05:22 +01:00
Laurent Destailleur	4d7f3cb741	Fixed: Pb of wrapping login page New: Use placeholder	2014-12-08 02:41:21 +01:00
Laurent Destailleur	ef73201b3e	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-12-08 00:11:21 +01:00
Laurent Destailleur	d7dd496239	Merge branch 'develop-html5' of https://github.com/aspangaro/dolibarr into aspangaro-develop-html5	2014-12-08 00:09:01 +01:00
Laurent Destailleur	c3734b1a88	Merge pull request #2103 from grandoc/develop add default payment mode select	2014-12-08 00:03:05 +01:00
Laurent Destailleur	6ddae270b9	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-12-07 23:52:02 +01:00
Laurent Destailleur	634a9d8402	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/core/lib/functions.lib.php	2014-12-07 19:19:48 +01:00
Laurent Destailleur	c35018be5f	Fixed: Translations	2014-12-07 18:24:45 +01:00
Laurent Destailleur	0b766b1f47	Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7	2014-12-07 12:11:26 +01:00
Laurent Destailleur	ff23b0c0a6	Fix: No print	2014-12-07 12:10:50 +01:00
Laurent Destailleur	3186a8c23f	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2014-12-07 12:07:53 +01:00
Laurent Destailleur	c731321024	New: Function yn can show a visual checkbox	2014-12-07 01:57:23 +01:00
Juanjo Menent	fe23a851e7	Fix: datepicker first day of week can be monday by setting into display setup	2014-12-06 11:03:48 +01:00
Juanjo Menent	430b2ff8db	Fix: datepicker first day of week can be monday by setting into display setup	2014-12-06 11:00:49 +01:00
Florian HENRY	aaf2cca45f	Fix bug n sellist extrafield filtered	2014-12-05 21:25:43 +01:00
Laurent Destailleur	df066c3741	Fix: PHPCS	2014-12-05 20:34:36 +01:00
Laurent Destailleur	344aa40858	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: .travis.yml dev/codesniffer/ruleset.xml htdocs/core/class/conf.class.php htdocs/langs/en_US/productbatch.lang	2014-12-05 20:21:40 +01:00
Laurent Destailleur	5f353c39d1	Fix: PHPCS	2014-12-05 20:18:30 +01:00
Laurent Destailleur	efe2719f48	Fix: PHPCS	2014-12-05 20:12:32 +01:00
frederic34	5cce8c45e3	WIP PrintIPP	2014-12-05 18:23:54 +01:00
Laurent Destailleur	a5bdf952ee	Fix: PHPCS	2014-12-05 17:44:47 +01:00
Laurent Destailleur	a9338a0f9f	Fix: Maxi debug of module productbatch. Conflicts: htdocs/core/class/conf.class.php htdocs/langs/en_US/productbatch.lang	2014-12-05 16:04:37 +01:00
Laurent Destailleur	5457d3116a	Fix: Maxi debug of module productbatch.	2014-12-05 16:01:01 +01:00
Laurent Destailleur	ceba894d57	Start to work on new generation combo box.	2014-12-05 13:26:47 +01:00
Laurent Destailleur	bff65fc6b4	Fix: starting with var with always same color	2014-12-05 01:25:18 +01:00
Laurent Destailleur	8d405a147f	Merge remote-tracking branch 'origin/3.6' into 3.7 Conflicts: build/debian/changelog htdocs/core/tpl/objectline_create.tpl.php	2014-12-04 15:29:45 +01:00
Laurent Destailleur	6729544782	Merge remote-tracking branch 'origin/3.7' into develop Conflicts: htdocs/projet/tasks/task.php	2014-12-04 14:52:34 +01:00

... 16 17 18 19 20 ...

8303 Commits