2782 Commits

Author	SHA1	Message	Date
Laurent Destailleur	f0503dfaa9	Merge remote-tracking branch 'origin/3.4' into 3.5 ... Conflicts: ChangeLog htdocs/compta/stats/cabyprodserv.php htdocs/compta/stats/casoc.php	2014-01-03 18:28:00 +01:00
Laurent Destailleur	8d66497384	Update doc for 3.4.2	2014-01-03 18:23:07 +01:00
Marcos García de La Fuente	5f3d2aea51	Opensurvey polls tab cards can now be extended from external modules	2014-01-02 16:32:48 +01:00
Laurent Destailleur	ddde3339f8	Merge remote-tracking branch 'origin/3.5' into develop ... Conflicts: build/debian/changelog build/exe/doliwamp/doliwamp.iss build/makepack-dolibarr.pl build/rpm/dolibarr_fedora.spec build/rpm/dolibarr_generic.spec build/rpm/dolibarr_mandriva.spec build/rpm/dolibarr_opensuse.spec htdocs/filefunc.inc.php	2013-12-31 16:33:36 +01:00
Laurent Destailleur	0bdcda50c6	Merge remote-tracking branch 'origin/3.4' into 3.5 ... Conflicts: ChangeLog build/exe/doliwamp/doliwamp.iss build/pad/pad_dolibarr.xml build/rpm/dolibarr_fedora.spec build/rpm/dolibarr_generic.spec build/rpm/dolibarr_mandriva.spec build/rpm/dolibarr_opensuse.spec	2013-12-31 16:13:12 +01:00
Laurent Destailleur	b1ea05e0d1	Merge remote-tracking branch 'origin/3.3' into 3.4 ... Conflicts: ChangeLog build/debian/changelog build/exe/doliwamp/doliwamp.iss build/makepack-dolibarr.pl build/pad/pad_dolibarr.xml build/pad/pad_doliwamp.xml build/rpm/dolibarr_fedora.spec build/rpm/dolibarr_generic.spec build/rpm/dolibarr_mandriva.spec build/rpm/dolibarr_opensuse.spec htdocs/filefunc.inc.php	2013-12-31 15:55:10 +01:00
Laurent Destailleur	0e54780377	Fix: Update doc and packager for doliwamp ... Conflicts: build/exe/doliwamp/doliwamp.iss Conflicts: build/exe/doliwamp/doliwamp.iss Conflicts: build/exe/doliwamp/doliwamp.iss	2013-12-31 15:41:25 +01:00
Laurent Destailleur	a337517193	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop	2013-12-30 11:37:43 +01:00
Laurent Destailleur	49f3242796	Merge pull request #1357 from marcosgdf/payment_menu ... Payment menu	2013-12-26 16:19:49 -08:00
Laurent Destailleur	0e62d79ce2	Merge remote-tracking branch 'origin/3.5' into develop	2013-12-26 19:43:31 +01:00
Marcos García de La Fuente	917ddf0dee	Payments and Supplier payment pages tabs can now be extended from modules.	2013-12-25 03:16:57 +01:00
Laurent Destailleur	fcfe94d4ec	Merge remote-tracking branch 'origin/3.4' into 3.5 ... Conflicts: htdocs/product/liste.php	2013-12-24 16:28:27 +01:00
simnandez	bf333d4f54	Fix: Some config data are shared between suppliers orders and suppliers ... invoices	2013-12-23 16:39:37 +01:00
simnandez	d6b2f96c19	Fix: Some config data are shared between suppliers orders and suppliers ... invoices	2013-12-23 16:38:38 +01:00
Florian Henry	e971e4dfff	Fix [ bug #1202 ] Wrong amount in deposit % invoice from proposal	2013-12-23 11:05:14 +01:00
Laurent Destailleur	acc4850d20	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2013-12-19 20:57:24 +01:00
Laurent Destailleur	b35f44e3cb	New: Add option MAIN_HIDE_INACTIVETAB_ON_PRINT to hide inactive tabs ... when you use the "print" view on screen.	2013-12-19 20:57:13 +01:00
simnandez	03e2901070	Fix: Lost stats filters into year selection	2013-12-19 15:45:40 +01:00
simnandez	a1e0d84e37	Fix: Lost stats filters into year selection	2013-12-19 15:43:22 +01:00
Laurent Destailleur	c1ee59eef9	Qual: Add phpunit tests for margin lib	2013-12-16 14:10:52 +01:00
Marcos García	d65374bb02	Fixed bug #1196: Product barcode search does not expect 13th digit on EAN13 type ... Some code written by "hipnosapo" forum user in http://www.dolibarr.es/index.php/foro/7-bugs-versiones-estables/3891-ean13-buscador-codigo-barras-13-digitos#3891	2013-12-15 18:44:53 +01:00
Laurent Destailleur	fbeb61861a	Start to remove too low level permission. Philisophy of dolibarr is ... having a minum of permission. Starting to include one permission for each field we manage should not be into core. Also activation of "skype" field in a future should probably be rewritten to support as several communication id (chat, skype, hanghout) with only one feature.	2013-12-14 20:58:03 +01:00
Laurent Destailleur	dc754bbdc2	Fix: Trigger name conflicts and reference file was not matching real ... name of triggers.	2013-12-14 20:48:34 +01:00
Laurent Destailleur	eaf151d7f5	Merge remote-tracking branch 'origin/3.5' into develop ... Conflicts: htdocs/.gitignore htdocs/contact/fiche.php	2013-12-14 03:13:46 +01:00
Laurent Destailleur	8fb0986303	New: Add path file of trigger into admin trigger list page	2013-12-10 15:49:57 +01:00
Laurent Destailleur	72250f656e	Merge remote-tracking branch 'origin/3.4' into 3.5	2013-12-09 02:17:43 +01:00
Marcos García de La Fuente	beb93e9245	Resolved bug #1182: ODT company_country tag is htmlencoded	2013-12-08 20:23:44 +02:00
Laurent Destailleur	37b0780523	Merge remote-tracking branch 'origin/3.4' into 3.5 ... Conflicts: ChangeLog htdocs/comm/propal.php htdocs/ecm/tpl/builddatabase.tpl.php htdocs/fourn/commande/liste.php htdocs/product/admin/product_tools.php	2013-12-08 00:42:36 +01:00
Florian Henry	bc4cfd66db	Fix: fix unsubscribe URL into mailing when sending manually (not by ... script)	2013-12-02 15:07:34 +01:00
Florian Henry	11efc20755	Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 ... Conflicts: ChangeLog Change-Id: I90f7ee62c65ef449c8ca43857d9743d0d953cf4b	2013-12-01 22:50:18 +01:00
Florian Henry	c6991f97d4	[ bug #1174 ] Product translated description not good into PDF ... Country	2013-12-01 22:47:22 +01:00
Laurent Destailleur	4aea74d6fd	Fix: [ bug #1171 ] Documents lost in interventions after validating	2013-12-01 21:05:22 +01:00
Laurent Destailleur	131bbce6f3	Update changelog	2013-12-01 20:17:22 +01:00
Laurent Destailleur	fdc1209986	Fix: [ bug #1163 ] SQL Error when searching for supplier orders ... Conflicts: ChangeLog	2013-12-01 18:12:15 +01:00
Laurent Destailleur	84e3457023	Fix: [ bug #1161 ] Search on product label	2013-12-01 16:30:35 +01:00
Laurent Destailleur	8f1a553395	Fix: [ bug #1162 ] Traduction des mi-journées	2013-12-01 16:22:06 +01:00
Laurent Destailleur	395066519b	Fix: [ bug #1163 ] SQL Error when searching for supplier orders	2013-12-01 16:18:18 +01:00
Laurent Destailleur	b6386a3dce	Merge remote-tracking branch 'origin/3.5' into develop ... Conflicts: htdocs/core/tpl/objectline_add.tpl.php	2013-12-01 16:08:03 +01:00
Laurent Destailleur	d39ed05c5d	Merge remote-tracking branch 'origin/3.4' into 3.5 ... Conflicts: htdocs/comm/propal/list.php	2013-12-01 16:05:09 +01:00
Laurent Destailleur	5715e9c986	Merge remote-tracking branch 'origin/3.5' into develop	2013-11-28 17:06:11 +01:00
Laurent Destailleur	bdf8100d84	Merge remote-tracking branch 'origin/3.4' into 3.5 ... Conflicts: htdocs/core/lib/agenda.lib.php htdocs/product/stats/commande_fournisseur.php	2013-11-28 15:54:12 +01:00
Florian Henry	b9d37fd6f7	[ bug #1159 ] Commercial search "other" give p.note do not exists	2013-11-28 14:28:03 +01:00
Florian Henry	6615ee7e6f	[ bug #1148 ] Product consomation : supplier order bad status	2013-11-23 14:59:28 +01:00
simnandez	58a8f590e6	New: Add graph stats for suppliers orders in tab "stats" on products.	2013-11-22 14:47:16 +01:00
Florian Henry	f852c9a5bb	Fix [ bug #1145 ] Agenda button list type do not display	2013-11-22 14:43:15 +01:00
simnandez	5d34953200	New: Add list of orders products in tab "consumption" on thirdparties.	2013-11-22 14:30:29 +01:00
Laurent Destailleur	0e743d5024	Merge remote-tracking branch 'origin/3.4' into develop ... Conflicts: ChangeLog htdocs/adherents/admin/adherent.php htdocs/comm/propal/class/propal.class.php htdocs/commande/document.php htdocs/compta/facture/class/facture.class.php htdocs/compta/facture/list.php htdocs/cron/card.php htdocs/expedition/class/expedition.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/fourn/commande/document.php htdocs/langs/fr_FR/admin.lang htdocs/langs/fr_FR/cron.lang htdocs/langs/fr_FR/projects.lang htdocs/langs/nl_NL/admin.lang htdocs/langs/nl_NL/categories.lang htdocs/langs/nl_NL/commercial.lang htdocs/langs/nl_NL/companies.lang htdocs/langs/nl_NL/dict.lang htdocs/langs/nl_NL/main.lang htdocs/langs/nl_NL/margins.lang htdocs/langs/nl_NL/products.lang htdocs/societe/class/societe.class.php htdocs/societe/rib.php	2013-11-19 21:08:02 +01:00
Florian Henry	68718c6100	Update changelog	2013-11-19 10:42:29 +01:00
Laurent Destailleur	a92aa14459	Merge pull request #1299 from altairis-fr/3.4 ... fix wrong buy price update (confusion between entity and npr !)	2013-11-15 05:04:07 -08:00
aspangaro	200553c001	Update ChangeLog	2013-11-15 04:58:59 +01:00