3305 Commits

Author	SHA1	Message	Date
Laurent Destailleur	9188be57ce	Select2 component creates problem of sizing with jmobile.	2015-01-31 19:25:26 +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
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	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	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	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	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	49fa0056c8	[CORE] Avancement des replace (#new_ask_price).	2015-01-27 17:43:07 +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
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
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	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 Garcí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	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	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
Frédéric FRANCE	f3a3136452	Update html.form.class.php	2015-01-18 11:38:45 +01:00
Marcos Garcí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 Garcí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	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	8cd46e4830	Introduce option MAIN_HTML_TITLE to start to control format of html ... title content.	2015-01-17 14:34:16 +01:00
BENKE Charles	e07bb07bab	Update commondocgenerator.class.php ... add extrafield on odt lines	2015-01-12 18:18:43 +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
frederic34	60661ae948	Add some "classfortooltip"	2015-01-09 00:07:54 +01: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	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
philippe grand	96e6c66365	better translation and typo	2015-01-01 11:24:00 +01:00
Marcos García de La Fuente	86100758ff	Miscellaneous corrections	2014-12-28 20:13:15 +01:00
Marcos García de La Fuente	ef4d710f78	Improving CommonObject and Contrat documentation	2014-12-28 19:16:14 +01:00
Frédéric FRANCE	56dd276504	Enhance search_categories with select2	2014-12-28 15:17: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