lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,412 Commits 43 Branches 150 Tags 886 MiB
671243e8f6
Commit Graph

1285 Commits

Author SHA1 Message Date
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
Laurent Destailleur
9d2d165cfc Fix: debian key dfsg and not dsfg 2014-09-07 11:21:04 +02:00
Laurent Destailleur
f64cb085a7 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-08-30 18:27:34 +02:00
Laurent Destailleur
a518a7256c maj copyright 2014-08-29 11:17:38 +02:00
Laurent Destailleur
e4dbf6a9e4 Removed useless file 2014-08-29 11:02:21 +02:00
Laurent Destailleur
711e7e6fc6 Fix: phpunit test 
Fix: debian readme to upgrade tcpdf lib.
 2014-08-28 16:59:10 +02:00
Laurent Destailleur
4d506d29d9 Removed log output (log too long) 2014-08-28 16:14:35 +02:00
Laurent Destailleur
1e28fd3541 Fix: syntax error 2014-08-26 15:24:32 +02:00
Laurent Destailleur
42d992b009 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/lib/project.lib.php
	htdocs/fourn/facture/fiche.php
	htdocs/projet/class/project.class.php
 2014-08-08 01:26:53 +02:00
Laurent Destailleur
6d49259999 Exclude nltechno dir 2014-08-06 23:57:25 +02:00
Laurent Destailleur
f1ca5b3eea Exclude vagrant dir 2014-08-06 23:55:07 +02:00
Laurent Destailleur
f91e847562 Qual: Removed had coded value for version. 2014-08-06 09:23:37 +02:00
Laurent Destailleur
c2be3364e0 Merge remote-tracking branch 'origin/3.6' into develop 2014-08-04 22:19:53 +02:00
Laurent Destailleur
8167f30833 Fix: Exclude dev dir from bin package. 2014-08-04 01:25:38 +02:00
Laurent Destailleur
7d3c266a1d Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/agenda_other.php
	htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
	htdocs/install/mysql/migration/repair.sql
 2014-08-04 00:02:00 +02:00
Laurent Destailleur
a5a7fb4967 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-01 11:15:45 +02:00
Laurent Destailleur
cf72c05a99 Fix: debian package provided by dolibarr team use embedded libraries. 2014-08-01 02:11:37 +02:00
Laurent Destailleur
c895c892a5 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
 2014-07-29 01:17:00 +02:00
Laurent Destailleur
9681b9abad No need to close php 2014-07-27 14:14:34 +02:00
Laurent Destailleur
db091896a5 Prepare 3.6. 
Use google adsense tag of foundation for doxygen doc pages.

Version is no more encoded int odoxygen.

Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	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/compta/facture/impayees.php
	htdocs/filefunc.inc.php
 2014-07-26 18:10:51 +02:00
Laurent Destailleur
a8547e9c4d Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne 
s'appliquent pas
 2014-07-26 17:30:10 +02:00
Laurent Destailleur
10e677d2d9 Prepare script for 3.6 version 2014-07-26 17:28:06 +02:00
Laurent Destailleur
289a2c6312 Maj readme 2014-07-26 13:23:22 +02:00
Laurent Destailleur
a2760aeacb Typo 2014-07-23 10:26:43 +02:00
Laurent Destailleur
2cf9a7511b Add date of file so we know if file was correctly build before 
publishing it.
 2014-07-14 23:47:46 +02:00
Laurent Destailleur
9acf60d7c5 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	.travis.yml
	ChangeLog
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/core/class/html.formfile.class.php
 2014-07-14 23:36:10 +02:00