1660 Commits

Author	SHA1	Message	Date
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	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	16fa19be87	Doc to send unblock requests	2015-01-28 23:06:05 +01:00
aspangaro	467a274f76	Typo	2015-01-22 21:12:20 +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	839f73d568	Update doc	2015-01-18 14:57:25 +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	6414f415a8	Files compatible with apache 2.4	2015-01-11 15:30:34 +01:00
Laurent Destailleur	c7b311349e	Files compatible with apache 2.4	2015-01-11 15:16:55 +01:00
Laurent Destailleur	9662879e52	Fixed: Permissions	2015-01-11 15:15:51 +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
Laurent Destailleur	3848daeab8	Merge remote-tracking branch 'origin/3.6' into 3.7 ... 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 htdocs/product/stats/facture.php	2014-12-30 04:20:50 +01:00
Laurent Destailleur	953e736a97	Prepare version 3.6.2	2014-12-27 02:21:37 +01:00
Laurent Destailleur	71683d20cf	Update doc	2014-12-06 14:05:51 +01:00
Laurent Destailleur	72c3954f36	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: .travis.yml	2014-12-05 21:12:35 +01:00
Laurent Destailleur	f261e1736c	Update doc	2014-12-05 21:10:38 +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	17c6f84061	Update doc	2014-12-05 19:18:53 +01:00
Laurent Destailleur	ed5b89f7f1	Update doc	2014-12-05 17:55: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	a07852c699	Merge remote-tracking branch 'origin/3.5' into 3.6 ... Conflicts: build/debian/changelog build/exe/doliwamp/doliwamp.iss build/rpm/dolibarr_fedora.spec build/rpm/dolibarr_generic.spec build/rpm/dolibarr_mandriva.spec build/rpm/dolibarr_opensuse.spec htdocs/filefunc.inc.php	2014-12-04 15:22:08 +01:00
Laurent Destailleur	9e1b0d1abc	Prepare 3.5.6	2014-12-04 15:09:47 +01:00
Laurent Destailleur	577671e208	Exclude editorconfig from packages	2014-12-03 12:05:31 +01:00
Laurent Destailleur	7868d286d3	Update debian tuto	2014-12-02 14:42:21 +01:00
aspangaro	c4c69e191b	Replace <center> tags	2014-11-25 20:13:43 +01:00
Laurent Destailleur	0559e29c92	Prepare freeze	2014-11-07 21:52:50 +01:00
Laurent Destailleur	24862d6314	Corrections launchpad	2014-10-30 22:51:06 +01:00
Laurent Destailleur	2f5c7e5f9d	Prepare version 3.7 beta	2014-10-30 19:28:22 +01:00
Laurent Destailleur	87901d07de	Merge pull request #1986 from jfefe/patch-7 ... Update makepack-dolibarr.pl : indentation	2014-10-30 17:47:21 +01:00
Laurent Destailleur	8821fbac76	Merge remote-tracking branch 'origin/3.6' into develop ... Conflicts: htdocs/product/fiche.php htdocs/user/class/user.class.php	2014-10-30 11:19:29 +01:00
jfefe	a32817db9d	Update makepack-dolibarr.pl : indentation	2014-10-28 23:49:54 +01:00
Laurent Destailleur	41f0920656	Fix for debian	2014-10-24 23:50:10 +02:00
Laurent Destailleur	f498921715	Merge branch 'droposcommerce' of github.com:GPCsolutions/dolibarr into ... GPCsolutions-droposcommerce Conflicts: htdocs/install/mysql/migration/3.6.0-3.7.0.sql htdocs/langs/vi_VN/admin.lang htdocs/langs/vi_VN/shop.lang	2014-10-13 00:50:51 +02:00
Laurent Destailleur	9768550696	Merge remote-tracking branch 'origin/3.6' into develop ... Conflicts: ChangeLog htdocs/categories/fiche.php htdocs/comm/action/index.php htdocs/comm/propal.php htdocs/commande/fiche.php htdocs/compta/facture.php htdocs/compta/facture/class/facture.class.php htdocs/contrat/class/contrat.class.php htdocs/core/class/commonobject.class.php htdocs/core/tpl/objectline_create.tpl.php htdocs/fourn/fiche.php htdocs/product/composition/fiche.php htdocs/product/price.php htdocs/projet/tasks/task.php htdocs/projet/tasks/time.php	2014-10-12 02:54:34 +02:00
Laurent Destailleur	d518278166	Merge remote-tracking branch 'origin/3.5' into 3.6 ... Conflicts: htdocs/comm/propal.php htdocs/comm/propal/class/propal.class.php htdocs/commande/fiche.php htdocs/compta/facture/class/facture.class.php	2014-10-03 19:17:28 +02:00
Laurent Destailleur	05fe8e45b3	Exclude module dire from package	2014-10-03 19:07:49 +02:00
Raphaël Doursenaud	f01e76f686	Removed unmaintaned OScommerce module	2014-09-29 15:22:48 +02:00
Laurent Destailleur	14ab409ca9	Merge remote-tracking branch 'origin/3.6' into develop ... Conflicts: htdocs/admin/stock.php htdocs/admin/system/index.php htdocs/comm/fiche.php htdocs/core/lib/admin.lib.php htdocs/core/lib/holiday.lib.php htdocs/core/lib/pdf.lib.php htdocs/core/login/functions_forceuser.php htdocs/core/login/functions_http.php htdocs/core/menus/standard/auguria.lib.php htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php htdocs/filefunc.inc.php htdocs/holiday/define_holiday.php htdocs/opensurvey/fonctions.php htdocs/societe/canvas/actions_card_common.class.php test/phpunit/CompanyBankAccountTest.php test/phpunit/ExportTest.php test/phpunit/FactureTest.php test/phpunit/FunctionsLibTest.php test/phpunit/PropalTest.php test/phpunit/SocieteTest.php test/phpunit/WebservicesInvoicesTest.php test/phpunit/WebservicesThirdpartyTest.php	2014-09-28 02:14:32 +02:00
Laurent Destailleur	05f83dddf0	Fix: packager	2014-09-27 15:23:40 +02:00
Laurent Destailleur	7dcaa61218	Prepare 3.6.1	2014-09-27 13:23:38 +02:00
Laurent Destailleur	b8969edcc5	Prepare 3.6.1	2014-09-27 12:34:45 +02:00
Laurent Destailleur	2a9275d0de	Merge remote-tracking branch 'origin/3.6' into develop ... Conflicts: htdocs/societe/consumption.php	2014-09-19 11:09:51 +02:00
Laurent Destailleur	d288b19f4d	Merge remote-tracking branch 'origin/3.5' into 3.6	2014-09-19 11:07:15 +02:00
Laurent Destailleur	3a38153889	Typo error	2014-09-18 22:42:43 +02:00
Laurent Destailleur	83447243ae	Merge remote-tracking branch 'origin/3.6' into develop ... Conflicts: build/debian/get-orig-source.sh htdocs/product/class/product.class.php htdocs/societe/soc.php	2014-09-15 22:58:39 +02:00
Laurent Destailleur	05f3a47018	Merge remote-tracking branch 'origin/3.5' into 3.6 ... Conflicts: build/debian/control htdocs/compta/bank/account.php htdocs/fourn/paiement/fiche.php htdocs/product/class/product.class.php htdocs/product/fiche.php	2014-09-15 22:52:59 +02:00
Laurent Destailleur	76ba3301c3	Fix: Syntax for license key	2014-09-14 22:34:17 +02:00
Laurent Destailleur	20bec865fd	Fix: checkstyle	2014-09-14 00:27:36 +02:00
Laurent Destailleur	ba70c1a08a	Fix: typo on debian files	2014-09-13 20:47:34 +02:00
Laurent Destailleur	2c46613f4a	New: View per user into agenda.	2014-09-07 19:56:17 +02:00