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
|
b5690142aa
|
Prepare 3.6.3
|
2015-03-29 16:26:31 +02:00 |
|
Laurent Destailleur
|
3cc4358e72
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
build/makepack-dolibarr.pl
htdocs/commande/liste.php
htdocs/product/stock/product.php
|
2015-03-29 15:24:17 +02:00 |
|
Laurent Destailleur
|
ffe1ee0d84
|
Target 98 to publish of dolibarr sevrer is now working
|
2015-03-28 17:12:31 +01:00 |
|
Laurent Destailleur
|
5e33068e29
|
Update doc
|
2015-03-28 16:51:25 +01:00 |
|
Laurent Destailleur
|
11ae661303
|
Merge remote-tracking branch 'origin/3.6' into 3.7
|
2015-02-14 14:01:18 +01:00 |
|
Laurent Destailleur
|
6189db677d
|
Fix package .exe
|
2015-02-14 11:25:26 +01:00 |
|
aspangaro
|
467a274f76
|
Typo
|
2015-01-22 21:12:20 +01:00 |
|
Laurent Destailleur
|
839f73d568
|
Update doc
|
2015-01-18 14:57:25 +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
|
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
|
f261e1736c
|
Update doc
|
2014-12-05 21:10:38 +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
|
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 |
|