lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

1900 Commits

Author SHA1 Message Date
Laurent Destailleur
04aba8ce96 Abandon package APS. Was never used. 2015-11-08 14:56:36 +01:00
Laurent Destailleur
9b8bb114cd FIX Add a protection to not make release if ChangeLog was not generated. 
Prepare package 3.7.2

Conflicts:
	ChangeLog
 2015-11-08 14:55:12 +01:00
Laurent Destailleur
98b887edae Update doc to generate ChangeLog 2015-11-08 12:23:40 +01:00
Laurent Destailleur
42ae4e10b3 Abandon package APS. Was never used. 2015-11-08 12:19:05 +01:00
Laurent Destailleur
972c364c37 FIX Add a protection to not make release if ChangeLog was not generated. 
Prepare package 3.8.2
 2015-11-08 12:12:28 +01:00
Laurent Destailleur
b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
 2015-10-16 10:12:36 +02:00
Regis Houssin
542ed40c9c Fix: compatibility with dolibarr versions before and after 3.7.1 2015-10-14 12:09:51 +02:00
Laurent Destailleur
df39a1054e Fix 3.8.1 2015-10-11 20:19:52 +02:00
Laurent Destailleur
68d4a9fc63 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/societe/list.php
 2015-10-04 20:57:00 +02:00
Laurent Destailleur
d54650905b FIX debian install when module mysqli is not installed. 2015-10-04 19:08:10 +02:00
Laurent Destailleur
9eab5206d4 Fix typo 2015-10-04 14:08:32 +02:00
Juanjo Menent
31230d296d Merge remote-tracking branch 'upstream/3.8' into develop 2015-10-03 23:51:38 +02:00
Laurent Destailleur
4e5ca151b5 Make process to update launchpad easier. 2015-10-03 20:39:15 +02:00
Laurent Destailleur
bea789edfe Make process to update launchpad easier. 2015-10-03 20:09:54 +02:00
Laurent Destailleur
3f506552e3 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/theme/md_exp/style.css.php
 2015-09-27 21:29:16 +02:00
Laurent Destailleur
12a08ae4e1 Prepare 3.8.1 2015-09-23 10:25:06 +02:00
Laurent Destailleur
f81df66564 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/.gitignore
	htdocs/categories/edit.php
 2015-09-23 00:34:57 +02:00
Laurent Destailleur
077c696c09 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/.gitignore
	htdocs/theme/.gitignore
 2015-09-22 16:28:34 +02:00
Laurent Destailleur
c125ba0d66 Update ignore to secure 
Conflicts:
	htdocs/.gitignore
 2015-09-22 15:42:59 +02:00
Laurent Destailleur
75daddbbe2 Update ignore to secure 2015-09-22 15:40:49 +02:00
Laurent Destailleur
2ce43dc0d8 Update ignore to secure 2015-09-22 15:40:17 +02:00
Laurent Destailleur
27b1f2ecc6 Merge remote-tracking branch 'origin/3.8' into develop 2015-09-17 19:52:13 +02:00
Laurent Destailleur
8bb832d06b Fix Natural english 2015-09-17 00:48:10 +02:00
Laurent Destailleur
9cbd236c8c Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2015-09-16 22:09:21 +02:00
Raphaël Doursenaud
cb31ab3e2b FIX Syntax error in Debian Apache configuration 
This issue prevented Apache from starting after dolibarr deb package
installation with the following error:
Syntax error on line 30 of /etc/apache2/conf.d/dolibarr.conf:
order takes one argument, 'allow,deny', 'deny,allow', or 'mutual-failure'
 2015-09-16 19:53:32 +02:00
Laurent Destailleur
4eedec0274 Fix tool to generate filecheck 2015-09-13 20:25:33 +02:00
Laurent Destailleur
52aee5562f Update doc 2015-09-03 18:11:26 +02:00
Laurent Destailleur
69a4e2cd95 Update doc 2015-09-03 17:27:29 +02:00
Laurent Destailleur
001f1b4c31 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/filefunc.inc.php
 2015-09-03 10:41:44 +02:00
Laurent Destailleur
2754d7dbec Update doc 2015-09-01 11:59:03 +02:00
Laurent Destailleur
5f30ad3b63 Fix no link to show if id empty 2015-08-19 18:27:12 +02:00
Laurent Destailleur
8d18507d5f Bad help 2015-08-14 15:35:25 +02:00
Juanjo Menent
cc32b9387b Merge remote-tracking branch 'origin/3.7' into 3.8 2015-08-10 20:43:11 +02:00
Regis Houssin
94ac0f5305 Fix: remove custom dir creation 2015-08-09 13:25:09 +02:00
Laurent Destailleur
38d30b5590 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/fourn/facture/card.php
 2015-07-21 00:17:11 +02:00
Laurent Destailleur
f0ed7dac09 Exclude tested module 2015-07-20 12:21:15 +02:00
Laurent Destailleur
205c5aba82 Clean packages 2015-07-13 16:23:41 +02:00
Laurent Destailleur
0542e43b71 Prepare 3.8 2015-07-13 00:23:46 +02:00
Laurent Destailleur
ccd471bcd5 Update doc 2015-07-12 23:53:00 +02:00
Laurent Destailleur
66ae756c72 Prepare 3.8 2015-07-12 23:47:39 +02:00
Laurent Destailleur
1ba5afbc7d Update doc. Prepare 3.8 2015-07-12 18:56:00 +02:00
Raphaël Doursenaud
572ce7bcbb NEW: Rename install etape to step 2015-07-06 15:44:33 +02:00
Laurent Destailleur
dc050d39eb Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/adherents/type.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/js/lib_batch.js
	htdocs/core/modules/modUser.class.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/card.php
	htdocs/societe/consumption.php
	htdocs/user/info.php
	htdocs/user/note.php
	htdocs/user/param_ihm.php
	htdocs/user/perms.php
 2015-06-29 00:09:28 +02:00
Laurent Destailleur
6fb53ecb97 Update doc 2015-06-28 23:33:03 +02:00
Laurent Destailleur
f8085c8ae6 Update doc 2015-06-28 12:34:21 +02:00
Laurent Destailleur
8f691138e8 NEW Can edit Background color for Top menu and Background color for 
table title line (works only with theme menu eldy).
 2015-06-26 16:21:09 +02:00
Laurent Destailleur
a6a027f5c4 Fix several pb with javascript 2015-06-20 17:24:34 +02:00
Laurent Destailleur
c023c078ae Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-06-17 00:07:44 +02:00
Laurent Destailleur
844ca58096 Fix: custom dir is missing 2015-06-17 00:05:41 +02:00
Laurent Destailleur
43ed48896a Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/debian/changelog
	htdocs/filefunc.inc.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2015-06-05 18:31:53 +02:00
Laurent Destailleur
1f92f542a6 NEW Hidden option THEME_ELDY_USE_HOVER is stable enough to become 
officialy visible into setup.
 2015-06-04 13:32:21 +02:00
Laurent Destailleur
4f75ab79db Prepare 3.7.2 2015-06-01 16:32:33 +02:00
Laurent Destailleur
227f2842c2 Prepare version 3.7.1 2015-05-31 18:03:24 +02:00
Laurent Destailleur
7d9856f3d8 Update doc 2015-05-31 17:52:32 +02:00
Laurent Destailleur
11d4a945b0 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/adherents/liste.php
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/contact/list.php
	htdocs/contrat/liste.php
	htdocs/product/liste.php
 2015-05-25 18:08:23 +02:00
Laurent Destailleur
fe3f701928 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	htdocs/expedition/list.php
	htdocs/filefunc.inc.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/user/class/user.class.php
 2015-05-16 17:09:42 +02:00
Laurent Destailleur
a4df49f6c8 Prepare packaging 2015-05-16 17:04:36 +02:00
Laurent Destailleur
e4aaff1de9 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/debian/changelog
	build/makepack-dolibarr.pl
	build/makepack-howto.txt
	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/class/product.class.php
 2015-05-16 17:01:40 +02:00
Laurent Destailleur
5b00ba11fd Prepare packaging 2015-05-16 16:54:54 +02:00
Laurent Destailleur
cabbb9e421 Merge remote-tracking branch 'origin/3.5' into 3.6 
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
 2015-05-16 16:49:03 +02:00
Laurent Destailleur
e46a8b3b54 Enhance packaging 2015-05-16 16:41:55 +02:00
Laurent Destailleur
e8fb89f89f Prepare packaging 3.7 2015-05-16 16:38:47 +02:00
Laurent Destailleur
4dcdea5219 Prepare package 3.5.7 
Removed hardcoded version from rpm spec files, so it will not be
necessary to update this files when making a new release.
 2015-05-16 16:08:05 +02:00
Laurent Destailleur
80943111cc Prepare 3.5.7 2015-05-16 15:26:34 +02:00
Laurent Destailleur
92a25e3d4c Prepare 3.7.1 2015-05-12 00:11:51 +02:00
Laurent Destailleur
83e4fe5d95 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/fourn/facture/list.php
 2015-05-12 00:09:03 +02:00
Laurent Destailleur
c2b31a37ba Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/contrat/fiche.php
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/fiche.php
	htdocs/user/fiche.php
 2015-05-11 23:53:38 +02:00
Laurent Destailleur
896d95cf1c Add doc to build when ony changelog change 2015-05-05 10:23:47 +02:00
Laurent Destailleur
7419319c0f Protection into packager 2015-04-29 22:39:42 +02:00
Laurent Destailleur
53bf90a3e2 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2015-04-28 21:54:13 +02:00
Laurent Destailleur
60a56da370 Some change into css. Tabs background are now white so main content is 
black on white (better contrast).
Fix editfieldval for date.
 2015-04-25 22:20:10 +02:00
Laurent Destailleur
100fa1067e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/bank/virement.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modProjet.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_GB/admin.lang
	htdocs/langs/es_AR/orders.lang
	htdocs/langs/es_AR/trips.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/orders.lang
	htdocs/langs/es_CO/trips.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/pl_PL/interventions.lang
	htdocs/langs/pt_BR/trips.lang
	htdocs/langs/ro_RO/productbatch.lang
	htdocs/langs/ro_RO/trips.lang
	htdocs/main.inc.php
	htdocs/projet/element.php
 2015-04-22 17:57:57 +02:00
Laurent Destailleur
3d609d5fd0 Sync transifex 2015-04-22 14:58:06 +02:00
Laurent Destailleur
ae103e34b8 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/debian/changelog
	htdocs/compta/facture.php
	htdocs/core/lib/price.lib.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/opensurvey/public/studs.php
	htdocs/projet/element.php
 2015-04-13 13:08:46 +02:00
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
8e9c1c4747 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/list.php
	htdocs/core/class/notify.class.php
	htdocs/core/login/functions_dolibarr.php
	htdocs/exports/export.php
	htdocs/langs/en_US/admin.lang
 2015-04-01 16:33:39 +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
aspangaro
2b2b43afb6 Dir "Don" 2015-03-25 22:37:14 +01:00
aspangaro
f778f47049 Add dirs 2015-03-25 21:46:08 +01:00
Laurent Destailleur
b884b28991 Include module loan 2015-03-23 23:39:14 +01:00
Laurent Destailleur
560b4541cd Update packager. 2015-03-05 22:08:16 +01:00
Laurent Destailleur
3e853b4129 Bad comment char 2015-02-24 16:17:52 +01:00
Laurent Destailleur
cae82104ca Clean tool to generate checksum file 2015-02-24 12:44:12 +01:00
frederic34
ad3e91dc9f WIP 2015-02-21 14:06:33 +01:00
Laurent Destailleur
e5b401c8f2 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/langs/es_ES/agenda.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/fr_FR/stocks.lang
	htdocs/langs/fr_FR/suppliers.lang
 2015-02-15 19:51:49 +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
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
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
Laurent Destailleur
ff5ea31452 Fix: Date error 2014-07-11 12:40:30 +02:00
Laurent Destailleur
5fd6bb94b9 Version beta 2014-06-20 20:31:57 +02:00
Laurent Destailleur
9706e23281 Fix changelog 2014-06-20 17:26:58 +02:00
Laurent Destailleur
47c982c506 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	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-06-10 08:45:08 +02:00
Laurent Destailleur
5853b9eb30 Merge branch 'bug-1416' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1416

Conflicts:
	ChangeLog
 2014-06-10 01:37:43 +02:00
Laurent Destailleur
c1431bdf93 Fix: Typo 2014-05-31 14:22:19 +02:00
Laurent Destailleur
cbd080f6cb Fix: Typo 2014-05-31 14:02:36 +02:00
Laurent Destailleur
baa573435b Fix: Exclude files from package with missing sources. 2014-05-27 00:58:00 +02:00
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again) 
These were reintroduced by careless merge
 2014-05-26 13:51:25 +02:00
Laurent Destailleur
6137d7ed45 Update doc 2014-05-25 11:15:26 +02:00
Laurent Destailleur
936adfd0f5 Typo 2014-05-25 03:08:02 +02:00
Laurent Destailleur
b7f55ea99c Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/liste.php
 2014-05-18 11:52:52 +02:00
Laurent Destailleur
1012595ff2 Fix for 3.6 beta 2014-05-18 11:33:07 +02:00
Laurent Destailleur
fd271d7c92 Fix: Missing to set version to beta 2014-05-14 14:09:57 +02:00
Laurent Destailleur
8ab09d63a2 Fix: Rss features 2014-05-14 11:16:12 +02:00
Laurent Destailleur
3a29d7dac1 Update doc 2014-05-12 19:35:46 +02:00
Laurent Destailleur
801d99b947 Update doc 2014-05-10 02:10:13 +02:00
Laurent Destailleur
9f795331f5 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/charges.php
	htdocs/core/db/mysql.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php
 2014-05-06 23:58:17 +02:00
Laurent Destailleur
53a1e7d09a Fix: Script can be ran from non root user, even from a directory with no 
write permissions.
 2014-05-06 16:26:58 +02:00
Laurent Destailleur
1c6c79811d Prepare version 3.5.3 2014-05-06 16:09:13 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Laurent Destailleur
50c10d3d1e Fix: Can disable features with PHPEXCEL (no DLSF compatible). 
Fix: Can disable features with CKEDITOR.
 2014-05-03 02:20:26 +02:00
Laurent Destailleur
ecc6bdf4aa Exclude system file from packages 2014-04-28 03:08:28 +02:00
Laurent Destailleur
bb2c829997 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
 2014-04-18 12:34:32 +02:00
Laurent Destailleur
cb2393e663 Fix: Solve problem of _source directory. 2014-04-13 01:28:44 +02:00
Laurent Destailleur
80f1100bf9 Fix: Removed warning 2014-04-12 01:32:46 +02:00
Laurent Destailleur
1b02cdd352 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	dev/initdata/mysqldump_dolibarr_3.5.0.sql
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/index.php
	htdocs/user/fiche.php
 2014-04-12 00:53:25 +02:00
Laurent Destailleur
89dca04720 Update doc 2014-04-08 23:06:58 +02:00
Laurent Destailleur
eb0d98d406 Comment 2014-04-07 20:41:33 +02:00
Laurent Destailleur
f1466e64af Fix: Build for obs 2014-04-01 09:12:49 +02:00
Laurent Destailleur
d452624ebc Fix: Building on obs 2014-04-01 09:08:52 +02:00
Laurent Destailleur
d3dc68d8a7 Prepare script to publish to foundation storage 2014-03-30 19:33:29 +02:00
Laurent Destailleur
f9c1b590d0 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/perl/virtualmin/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.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/filefunc.inc.php
 2014-03-19 22:29:18 +01:00
Laurent Destailleur
2bc63a86a9 Alignement of debian packaging files 2014-03-19 18:05:52 +01:00
Laurent Destailleur
12e2909564 Merge pull request #1490 from GPCsolutions/release 
Makepack improvements
 2014-03-16 20:32:26 +01:00
Raphaël Doursenaud
0d511f9659 Readme: default to markdown version 2014-03-16 15:01:06 +01:00
Raphaël Doursenaud
991d0e2a30 Makepack: clean git artifacts 2014-03-16 14:26:14 +01:00
Laurent Destailleur
291d546c30 Qual: Removed useless code 2014-03-16 14:21:23 +01:00
Laurent Destailleur
c8f63d6160 Fix: Prepare for 3.5.2 2014-03-14 00:17:39 +01:00
Laurent Destailleur
07ac9d3922 Add example for basic authent 2014-03-12 15:19:49 +01:00
Laurent Destailleur
38423b9ec9 Fix: bad version 2014-03-09 03:29:58 +01:00
Laurent Destailleur
271ef07c7d Packager works with beta versions 2014-03-09 03:04:47 +01:00
Laurent Destailleur
fad9ba6130 Merge remote-tracking branch 'origin/3.5' into develop 2014-03-09 02:49:39 +01:00
Laurent Destailleur
b8d816b208 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	build/debian/dolibarr.install
	build/makepack-dolibarr.pl
 2014-03-09 02:48:37 +01:00
Laurent Destailleur
7a741e0691 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	build/makepack-dolibarr.pl
 2014-03-09 02:14:00 +01:00
Laurent Destailleur
f652a4d807 Script to prepare 3.3.5 2014-03-09 02:08:13 +01:00
Laurent Destailleur
b2116c37d8 Enhance packager: 
- No need to be root to run script
- create git tag of version
- debian package do not use the deprecated dpatch command
- debian package is a quilt package (not native)
- debian package was missing file watch
- clean exclusion for zip and tgz package (exclusion must be done into
makepack-dolibarr.pl, not into specific package code)
- can publish files to sourceforge
 2014-03-09 01:37:08 +01:00
Laurent Destailleur
24b0ea6613 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-03-03 19:38:02 +01:00
Laurent Destailleur
ba90565982 Removed hard coded value of version from makepack-dolibarr.pl script. 2014-03-03 19:08:13 +01:00
Laurent Destailleur
908c39098d Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
 2014-02-16 19:47:51 +01:00
Laurent Destailleur
295f0fd9e7 Makepack is for version 3.5 2014-02-15 15:23:21 +01:00
Laurent Destailleur
ce8d13ead0 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/comm/action/fiche.php
	htdocs/filefunc.inc.php
	htdocs/install/check.php
 2014-02-10 00:38:10 +01:00
Laurent Destailleur
3906aaee8f Work on pdf doc generator 2014-02-10 00:25:16 +01:00
Laurent Destailleur
6a84a7f935 Prepare version 3.5.1 2014-02-08 13:56:28 +01:00
Laurent Destailleur
fc1600b97c Script to test htmldoc 2014-02-05 12:56:32 +01:00
Laurent Destailleur
efcff80a28 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	build/debian/control
	htdocs/fourn/facture/paiement.php
 2014-02-03 18:44:48 +01:00
Laurent Destailleur
70c262a99f Avoid duplicate a2en. 
No pass into log.
 2014-02-02 19:19:41 +01:00
Laurent Destailleur
ad0e78a56a Fix: debian and ubuntu package 2014-02-02 16:29:56 +01:00
Laurent Destailleur
8768ece9f7 Fix for ubuntu compatibility 2014-02-02 15:46:22 +01:00
Laurent Destailleur
4c60873d06 Fix: not dependencies by default to be compatible with all distrib. 2014-02-02 14:57:55 +01:00
Laurent Destailleur
873d44e2c0 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-02-02 14:18:43 +01:00
Laurent Destailleur
18f8c80b98 Fix: lintian warning in date 2014-02-02 13:59:38 +01:00
Laurent Destailleur
8e8fb27286 No more error for version in module file name. Version is taken from 
descriptor files.
 2014-01-26 01:06:47 +01:00
Laurent Destailleur
b6c2e7be05 No more error for version in module file name. Version is taken from 
descriptor files.
 2014-01-26 01:05:56 +01:00
Laurent Destailleur
1fd67807ce Merge remote-tracking branch 'origin/3.5' into develop 2014-01-18 01:13:29 +01:00
Laurent Destailleur
9aacb0e7ed Fix: bad permissions on files 2014-01-15 03:15:31 +01:00
Laurent Destailleur
923ff008c2 Update doc 2014-01-07 19:16:44 +01:00
Laurent Destailleur
4e2bce1600 Fix: No hard coded data 2014-01-02 10:55:41 +01:00
Laurent Destailleur
165f9617e9 Fix: No hard coded data 2014-01-02 10:55:11 +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
808abb6b4e Restore correct date 2013-12-31 16:03:58 +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
7fc052ce19 More prerequisites to check to run makepack-dolibarr to build debian 
package (check on dpatch too).
 2013-12-31 15:27:15 +01:00
Laurent Destailleur
50df4e1ff1 Fix: Update doc and packager for doliwamp 
Conflicts:
	build/exe/doliwamp/doliwamp.iss

Conflicts:
	build/exe/doliwamp/doliwamp.iss
 2013-12-31 15:23:16 +01:00
Laurent Destailleur
13eff7d629 More prerequisites to check to run makepack-dolibarr to build debian 
package (check on dpatch too).
 2013-12-31 15:19:39 +01:00
Laurent Destailleur
6d40c10b95 Prepare 3.5.0 release 2013-12-31 15:18:11 +01:00
Laurent Destailleur
247c49e094 Prepare 3.5.0 release 2013-12-31 15:17:10 +01:00
Laurent Destailleur
bec70d1f0e Fix: Update doc and packager for doliwamp 
Conflicts:
	build/exe/doliwamp/doliwamp.iss
 2013-12-31 15:09:38 +01:00
Laurent Destailleur
f0eb9b8a15 More prerequisites to check to run makepack-dolibarr to build debian 
package (check on dpatch too).
 2013-12-31 15:06:25 +01:00
Laurent Destailleur
70ac6efcc2 Fix: Update doc and packager for doliwamp 2013-12-31 15:04:59 +01:00
Laurent Destailleur
3ace6da1d5 More prerequisites to check to run makepack-dolibarr to build debian 
package (check on dpatch too).
 2013-12-31 14:24:01 +01:00
Laurent Destailleur
436f585b69 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	build/exe/doliwamp/doliwamp.iss
 2013-12-29 00:48:31 +01:00
Laurent Destailleur
3e39cd279d Fix: avoid to include not desired directory 2013-12-29 00:42:53 +01:00
Laurent Destailleur
0e62d79ce2 Merge remote-tracking branch 'origin/3.5' into develop 2013-12-26 19:43:31 +01:00
Laurent Destailleur
94a217bdc1 Merge remote-tracking branch 'origin/3.4' into 3.5 2013-12-26 19:41:59 +01:00
Laurent Destailleur
a7d0a7d663 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-12-26 19:40:56 +01:00
Laurent Destailleur
fce34301f9 More test to avoid errors when env is not complete. 2013-12-26 19:39:29 +01:00
Laurent Destailleur
c34e50114a Start to work on a basic print sticker tool 2013-12-15 03:23:10 +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
684be44846 Merge remote-tracking branch 'origin/3.4' into 3.5 2013-12-14 02:57:43 +01:00
Laurent Destailleur
4d84fc46a4 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	build/makepack-dolibarr.pl
 2013-12-14 02:56:23 +01:00
Laurent Destailleur
1f3f6cc7b8 Fix: Avoid to have external package into standard distribution 2013-12-14 02:55:12 +01:00
Laurent Destailleur
88aa0ad4da Fix: Doxygen problems 2013-12-14 01:28:59 +01:00
Laurent Destailleur
92d23b2735 Packaging rules 2013-12-12 15:37:54 +01:00
Laurent Destailleur
b96c977fa1 Fix: W3C 2013-12-05 00:45:44 +01:00
Laurent Destailleur
f86cf6c440 Check parameters of script 2013-12-01 15:22:47 +01:00
Laurent Destailleur
71a85464d5 Check parameters of script 2013-12-01 15:22:29 +01:00
Laurent Destailleur
a7c246cec1 Check parameters of script 2013-12-01 15:21:58 +01:00
Laurent Destailleur
8e51a4683f Check parameters of script 2013-12-01 15:20:57 +01:00
Laurent Destailleur
e0dd3090c9 Remove hardcoded strings 2013-11-30 10:58:43 +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
Laurent Destailleur
89f32bf46e Update doc 2013-11-27 18:45:04 +01:00
Laurent Destailleur
8981f506dc Fix: typo 2013-11-27 13:28:06 +01:00
Laurent Destailleur
01f3ba81af Update doc 2013-11-25 21:19:57 +01:00
Laurent Destailleur
1ddf9f6ac5 Fix: Not coherent filename 2013-11-24 19:34:25 +01:00
Laurent Destailleur
baebc7e91d Fix: Not coherent filename 2013-11-24 19:33:22 +01:00
Laurent Destailleur
73408479ba Merge remote-tracking branch 'origin/3.5' into develop 2013-11-24 13:19:41 +01:00
Laurent Destailleur
b75137d4ff Fix files that should not mix tab and spaces indent. 2013-11-24 13:02:20 +01:00
Laurent Destailleur
b8141ef2db Prepare 3.6 dev 2013-11-22 19:32:36 +01:00
Laurent Destailleur
03006db5a7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-11-20 23:10:59 +01:00
Laurent Destailleur
1ef08a88a4 Update packager 2013-11-20 23:10:38 +01:00
Laurent Destailleur
a26e337550 Update doc 2013-11-20 23:05:27 +01:00
Laurent Destailleur
040e3eec78 Update doc 2013-11-20 15:10:54 +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
Laurent Destailleur
0f4ceca8ec Fix: tons of bugs into ecm module 2013-11-17 02:59:01 +01:00
Laurent Destailleur
db9e9a3372 Prepare 3.5.0 beta 2013-11-07 00:41:27 +01:00
Laurent Destailleur
1838d45197 Update doc 2013-11-06 23:58:36 +01:00
Laurent Destailleur
469dd03673 Merge remote-tracking branch 'origin/3.4' 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/core/class/commonobject.class.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/filefunc.inc.php
	htdocs/langs/nl_NL/margins.lang
 2013-11-01 17:58:38 +01:00
Laurent Destailleur
e8a80e2365 Now comments in changelog are concatenated 2013-11-01 17:46:57 +01:00
Laurent Destailleur
84b36d1230 Prepare for 3.4.2 2013-11-01 17:24:09 +01:00
Laurent Destailleur
10cd9619f9 Update doc 2013-10-30 19:09:02 +01:00
Laurent Destailleur
8045f6091f Merge remote-tracking branch 'origin/3.4' into develop 2013-10-29 23:55:20 +01:00
Laurent Destailleur
d6b2d44350 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-10-29 23:51:46 +01:00
Laurent Destailleur
f71b47b282 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2013-10-29 23:46:15 +01:00
Laurent Destailleur
277fc1a274 Update doc 2013-10-29 23:38:39 +01:00
Laurent Destailleur
5fbb967941 Fix: restart of mysql for opensuse 2013-10-29 22:57:51 +01:00
Laurent Destailleur
0a11bf1769 Update doc 2013-10-29 15:14:36 +01:00
Laurent Destailleur
43fd4d0784 Complete debian packager tuto 2013-10-09 16:04:06 +02:00
Laurent Destailleur
44d2fbcb1a A better tag command 2013-09-22 19:41:14 +02:00
Laurent Destailleur
78210d951d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-20 21:57:56 +02:00
Laurent Destailleur
bb2404c16d Remove duplicate file for distributions to avoid warnings 2013-09-20 21:57:33 +02:00
Laurent Destailleur
0315cfdac6 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/debian/get-orig-source.sh
 2013-09-20 11:51:01 +02:00
Laurent Destailleur
7a1efdbab6 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-20 11:06:09 +02:00
Laurent Destailleur
bd0e328d5b Use official package directly to build debian. 2013-09-19 23:51:47 +02:00
Laurent Destailleur
9ee9079d78 update doc 2013-09-19 23:05:48 +02:00
Laurent Destailleur
2a1dae78ca Fix: We must not remove sources from packages 2013-09-19 19:49:41 +02:00
Laurent Destailleur
3d62303d59 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	build/debian/get-orig-source.sh
	build/debian/watch
	htdocs/fourn/ajax/getSupplierPrices.php
 2013-09-19 01:02:53 +02:00
Laurent Destailleur
a86e8f8fac Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-19 01:00:05 +02:00
Laurent Destailleur
848c693822 Fix: Error in url 2013-09-19 00:59:02 +02:00
Laurent Destailleur
847b0234c7 Change for debian 2013-09-19 00:49:51 +02:00
Laurent Destailleur
30c4d5dedb Fix for debian package 2013-09-19 00:39:13 +02:00
Cédric Salvador
d9a26d0aa9 natural search in list pages 2013-09-16 14:17:53 +02:00
Laurent Destailleur
c98c8d5007 Fix: url 2013-09-15 22:48:42 +02:00
Laurent Destailleur
85da57ce1b Add some files for sitemap build 2013-09-15 22:39:39 +02:00
Laurent Destailleur
e0ec92c843 Merge remote-tracking branch 'origin/3.4' into develop 2013-09-14 20:54:33 +02:00
Laurent Destailleur
d7f9e91955 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-14 20:53:39 +02:00
Laurent Destailleur
9adbb0e973 Fix: update copyright file 2013-09-14 20:51:21 +02:00
Laurent Destailleur
443eba900a Fix: Bad translation 2013-09-14 12:52:04 +02:00
Laurent Destailleur
5344aadc2e Fix: Bad translation 2013-09-14 12:51:01 +02:00
Laurent Destailleur
b1add3f9df Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/exe/doliwamp/doliwamp.iss
	htdocs/comm/propal/class/propal.class.php
	htdocs/contrat/class/contrat.class.php
 2013-09-13 09:32:41 +02:00
Laurent Destailleur
54976951a1 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-13 09:24:09 +02:00
Laurent Destailleur
86e827e3f7 Fix: Missing sources 
Fix: packager
 2013-09-12 23:47:36 +02:00
Laurent Destailleur
239cb02613 Doc 2013-09-11 23:10:19 +02:00
Laurent Destailleur
376a7e2e3c Remove checkstyle outpout that is too verbose. 
USe instead option -s
Disable a rule
 2013-09-10 11:59:15 +02:00
Laurent Destailleur
181f16543d Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/perl/virtualmin/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-09-06 01:42:40 +02:00
Laurent Destailleur
17fcceb872 Fix: typo 2013-09-06 01:38:13 +02:00
Laurent Destailleur
f45be6a2a7 Prepare for 3.4.1 
Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts:
	build/debian/changelog
 2013-09-06 01:37:07 +02:00
Laurent Destailleur
5db9505f40 Fix debian package 2013-09-06 01:30:49 +02:00
Laurent Destailleur
a9c14c80f0 Fix: debian files 2013-09-06 01:27:11 +02:00
Laurent Destailleur
c40f3df269 Update doc 2013-09-06 01:26:31 +02:00
Laurent Destailleur
38e4b0f9ac Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/debian/watch
 2013-09-05 23:57:30 +02:00
Laurent Destailleur
10779baadd Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-05 23:55:14 +02:00
Laurent Destailleur
c71c4e86f6 Fix: watch file for debian package. 2013-09-05 23:52:13 +02:00
Laurent Destailleur
556827c818 Fix: wash file 2013-09-05 22:58:11 +02:00
Laurent Destailleur
b1e8b9c02f Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-05 17:56:23 +02:00
Laurent Destailleur
7afb1aef14 Fix: Image was not correctly generated. Bad licence into it. 2013-09-05 17:53:07 +02:00
Laurent Destailleur
7229b728a3 Update doc 2013-09-04 23:02:02 +02:00
Laurent Destailleur
4298e5466a Removed nmu 2013-08-07 16:57:00 +02:00
Laurent Destailleur
386958c4d6 Update with last changes 2013-08-06 22:56:13 +02:00
Laurent Destailleur
521da839ba Update doc 2013-08-06 16:21:37 +02:00
Laurent Destailleur
80e04e967c Start to uniformize default debian package with current official 
package on work.
 2013-08-06 03:10:51 +02:00
Laurent Destailleur
827faed39b Update doc 2013-08-05 23:27:51 +02:00
Laurent Destailleur
6a998b202d Update doc 2013-07-31 15:21:48 +02:00
Laurent Destailleur
ae9c3cd780 Prepare 3.3.4 2013-07-26 16:43:06 +02:00
Laurent Destailleur
82e8ac72a8 Fix: Bad url 2013-07-24 22:32:20 +02:00
Laurent Destailleur
58c3938fb0 Add link to cloud solutions 2013-07-24 17:31:03 +02:00
Laurent Destailleur
2266b8b2a4 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
	htdocs/langs/ar_SA/bookmarks.lang
	htdocs/langs/ar_SA/boxes.lang
	htdocs/langs/ar_SA/cashdesk.lang
	htdocs/langs/ar_SA/categories.lang
	htdocs/langs/ar_SA/commercial.lang
	htdocs/langs/ar_SA/companies.lang
	htdocs/langs/ar_SA/compta.lang
	htdocs/langs/ar_SA/contracts.lang
	htdocs/langs/ar_SA/deliveries.lang
	htdocs/langs/ar_SA/dict.lang
	htdocs/langs/ar_SA/donations.lang
	htdocs/langs/ar_SA/ecm.lang
	htdocs/langs/ar_SA/errors.lang
	htdocs/langs/ar_SA/exports.lang
	htdocs/langs/ar_SA/externalsite.lang
	htdocs/langs/ar_SA/ftp.lang
	htdocs/langs/ar_SA/help.lang
	htdocs/langs/ar_SA/install.lang
	htdocs/langs/ar_SA/interventions.lang
	htdocs/langs/ar_SA/languages.lang
	htdocs/langs/ar_SA/ldap.lang
	htdocs/langs/ar_SA/mails.lang
	htdocs/langs/ar_SA/main.lang
	htdocs/langs/ar_SA/members.lang
	htdocs/langs/ar_SA/orders.lang
	htdocs/langs/ar_SA/oscommerce.lang
	htdocs/langs/ar_SA/paybox.lang
	htdocs/langs/ar_SA/paypal.lang
	htdocs/langs/ar_SA/projects.lang
	htdocs/langs/ar_SA/propal.lang
	htdocs/langs/ar_SA/sendings.lang
	htdocs/langs/ar_SA/shop.lang
	htdocs/langs/ar_SA/sms.lang
	htdocs/langs/ar_SA/stocks.lang
	htdocs/langs/ar_SA/suppliers.lang
	htdocs/langs/ar_SA/trips.lang
	htdocs/langs/ar_SA/users.lang
	htdocs/langs/ar_SA/withdrawals.lang
	htdocs/langs/ar_SA/workflow.lang
	htdocs/langs/bg_BG/admin.lang
	htdocs/langs/bg_BG/agenda.lang
	htdocs/langs/bg_BG/banks.lang
	htdocs/langs/bg_BG/bills.lang
	htdocs/langs/bg_BG/bookmarks.lang
	htdocs/langs/bg_BG/boxes.lang
	htdocs/langs/bg_BG/cashdesk.lang
	htdocs/langs/bg_BG/categories.lang
	htdocs/langs/bg_BG/commercial.lang
	htdocs/langs/bg_BG/companies.lang
	htdocs/langs/bg_BG/compta.lang
	htdocs/langs/bg_BG/contracts.lang
	htdocs/langs/bg_BG/deliveries.lang
	htdocs/langs/bg_BG/dict.lang
	htdocs/langs/bg_BG/donations.lang
	htdocs/langs/bg_BG/ecm.lang
	htdocs/langs/bg_BG/errors.lang
	htdocs/langs/bg_BG/exports.lang
	htdocs/langs/bg_BG/externalsite.lang
	htdocs/langs/bg_BG/ftp.lang
	htdocs/langs/bg_BG/help.lang
	htdocs/langs/bg_BG/holiday.lang
	htdocs/langs/bg_BG/install.lang
	htdocs/langs/bg_BG/interventions.lang
	htdocs/langs/bg_BG/languages.lang
	htdocs/langs/bg_BG/ldap.lang
	htdocs/langs/bg_BG/mailmanspip.lang
	htdocs/langs/bg_BG/mails.lang
	htdocs/langs/bg_BG/main.lang
	htdocs/langs/bg_BG/members.lang
	htdocs/langs/bg_BG/orders.lang
	htdocs/langs/bg_BG/oscommerce.lang
	htdocs/langs/bg_BG/other.lang
	htdocs/langs/bg_BG/paybox.lang
	htdocs/langs/bg_BG/paypal.lang
	htdocs/langs/bg_BG/products.lang
	htdocs/langs/bg_BG/projects.lang
	htdocs/langs/bg_BG/propal.lang
	htdocs/langs/bg_BG/sendings.lang
	htdocs/langs/bg_BG/shop.lang
	htdocs/langs/bg_BG/sms.lang
	htdocs/langs/bg_BG/stocks.lang
	htdocs/langs/bg_BG/suppliers.lang
	htdocs/langs/bg_BG/trips.lang
	htdocs/langs/bg_BG/users.lang
	htdocs/langs/bg_BG/withdrawals.lang
	htdocs/langs/bg_BG/workflow.lang
	htdocs/langs/ca_ES/paybox.lang
	htdocs/langs/da_DK/agenda.lang
	htdocs/langs/da_DK/banks.lang
	htdocs/langs/da_DK/bookmarks.lang
	htdocs/langs/da_DK/boxes.lang
	htdocs/langs/da_DK/cashdesk.lang
	htdocs/langs/da_DK/categories.lang
	htdocs/langs/da_DK/commercial.lang
	htdocs/langs/da_DK/companies.lang
	htdocs/langs/da_DK/compta.lang
	htdocs/langs/da_DK/contracts.lang
	htdocs/langs/da_DK/deliveries.lang
	htdocs/langs/da_DK/dict.lang
	htdocs/langs/da_DK/donations.lang
	htdocs/langs/da_DK/errors.lang
	htdocs/langs/da_DK/exports.lang
	htdocs/langs/da_DK/externalsite.lang
	htdocs/langs/da_DK/ftp.lang
	htdocs/langs/da_DK/install.lang
	htdocs/langs/da_DK/interventions.lang
	htdocs/langs/da_DK/languages.lang
	htdocs/langs/da_DK/mails.lang
	htdocs/langs/da_DK/members.lang
	htdocs/langs/da_DK/orders.lang
	htdocs/langs/da_DK/oscommerce.lang
	htdocs/langs/da_DK/paybox.lang
	htdocs/langs/da_DK/paypal.lang
	htdocs/langs/da_DK/projects.lang
	htdocs/langs/da_DK/propal.lang
	htdocs/langs/da_DK/sendings.lang
	htdocs/langs/da_DK/shop.lang
	htdocs/langs/da_DK/sms.lang
	htdocs/langs/da_DK/stocks.lang
	htdocs/langs/da_DK/suppliers.lang
	htdocs/langs/da_DK/trips.lang
	htdocs/langs/da_DK/users.lang
	htdocs/langs/da_DK/withdrawals.lang
	htdocs/langs/da_DK/workflow.lang
	htdocs/langs/de_DE/admin.lang
	htdocs/langs/de_DE/agenda.lang
	htdocs/langs/de_DE/banks.lang
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/de_DE/bookmarks.lang
	htdocs/langs/de_DE/boxes.lang
	htdocs/langs/de_DE/cashdesk.lang
	htdocs/langs/de_DE/categories.lang
	htdocs/langs/de_DE/commercial.lang
	htdocs/langs/de_DE/companies.lang
	htdocs/langs/de_DE/compta.lang
	htdocs/langs/de_DE/contracts.lang
	htdocs/langs/de_DE/deliveries.lang
	htdocs/langs/de_DE/dict.lang
	htdocs/langs/de_DE/donations.lang
	htdocs/langs/de_DE/ecm.lang
	htdocs/langs/de_DE/errors.lang
	htdocs/langs/de_DE/exports.lang
	htdocs/langs/de_DE/externalsite.lang
	htdocs/langs/de_DE/ftp.lang
	htdocs/langs/de_DE/help.lang
	htdocs/langs/de_DE/install.lang
	htdocs/langs/de_DE/interventions.lang
	htdocs/langs/de_DE/languages.lang
	htdocs/langs/de_DE/ldap.lang
	htdocs/langs/de_DE/mails.lang
	htdocs/langs/de_DE/main.lang
	htdocs/langs/de_DE/members.lang
	htdocs/langs/de_DE/orders.lang
	htdocs/langs/de_DE/oscommerce.lang
	htdocs/langs/de_DE/other.lang
	htdocs/langs/de_DE/paybox.lang
	htdocs/langs/de_DE/paypal.lang
	htdocs/langs/de_DE/products.lang
	htdocs/langs/de_DE/projects.lang
	htdocs/langs/de_DE/propal.lang
	htdocs/langs/de_DE/sendings.lang
	htdocs/langs/de_DE/shop.lang
	htdocs/langs/de_DE/sms.lang
	htdocs/langs/de_DE/stocks.lang
	htdocs/langs/de_DE/suppliers.lang
	htdocs/langs/de_DE/trips.lang
	htdocs/langs/de_DE/users.lang
	htdocs/langs/de_DE/withdrawals.lang
	htdocs/langs/de_DE/workflow.lang
	htdocs/langs/el_GR/agenda.lang
	htdocs/langs/el_GR/banks.lang
	htdocs/langs/el_GR/bookmarks.lang
	htdocs/langs/el_GR/boxes.lang
	htdocs/langs/el_GR/cashdesk.lang
	htdocs/langs/el_GR/commercial.lang
	htdocs/langs/el_GR/companies.lang
	htdocs/langs/el_GR/compta.lang
	htdocs/langs/el_GR/contracts.lang
	htdocs/langs/el_GR/deliveries.lang
	htdocs/langs/el_GR/dict.lang
	htdocs/langs/el_GR/donations.lang
	htdocs/langs/el_GR/errors.lang
	htdocs/langs/el_GR/externalsite.lang
	htdocs/langs/el_GR/ftp.lang
	htdocs/langs/el_GR/help.lang
	htdocs/langs/el_GR/install.lang
	htdocs/langs/el_GR/interventions.lang
	htdocs/langs/el_GR/languages.lang
	htdocs/langs/el_GR/ldap.lang
	htdocs/langs/el_GR/mails.lang
	htdocs/langs/el_GR/main.lang
	htdocs/langs/el_GR/orders.lang
	htdocs/langs/el_GR/paybox.lang
	htdocs/langs/el_GR/paypal.lang
	htdocs/langs/el_GR/projects.lang
	htdocs/langs/el_GR/propal.lang
	htdocs/langs/el_GR/sendings.lang
	htdocs/langs/el_GR/shop.lang
	htdocs/langs/el_GR/sms.lang
	htdocs/langs/el_GR/stocks.lang
	htdocs/langs/el_GR/suppliers.lang
	htdocs/langs/el_GR/trips.lang
	htdocs/langs/el_GR/users.lang
	htdocs/langs/el_GR/withdrawals.lang
	htdocs/langs/el_GR/workflow.lang
	htdocs/langs/en_US/bookmarks.lang
	htdocs/langs/en_US/ftp.lang
	htdocs/langs/en_US/other.lang
	htdocs/langs/en_US/paypal.lang
	htdocs/langs/et_EE/admin.lang
	htdocs/langs/et_EE/agenda.lang
	htdocs/langs/et_EE/banks.lang
	htdocs/langs/et_EE/bills.lang
	htdocs/langs/et_EE/bookmarks.lang
	htdocs/langs/et_EE/boxes.lang
	htdocs/langs/et_EE/cashdesk.lang
	htdocs/langs/et_EE/categories.lang
	htdocs/langs/et_EE/commercial.lang
	htdocs/langs/et_EE/companies.lang
	htdocs/langs/et_EE/compta.lang
	htdocs/langs/et_EE/contracts.lang
	htdocs/langs/et_EE/deliveries.lang
	htdocs/langs/et_EE/dict.lang
	htdocs/langs/et_EE/donations.lang
	htdocs/langs/et_EE/ecm.lang
	htdocs/langs/et_EE/errors.lang
	htdocs/langs/et_EE/exports.lang
	htdocs/langs/et_EE/externalsite.lang
	htdocs/langs/et_EE/ftp.lang
	htdocs/langs/et_EE/help.lang
	htdocs/langs/et_EE/install.lang
	htdocs/langs/et_EE/interventions.lang
	htdocs/langs/et_EE/languages.lang
	htdocs/langs/et_EE/ldap.lang
	htdocs/langs/et_EE/mails.lang
	htdocs/langs/et_EE/main.lang
	htdocs/langs/et_EE/members.lang
	htdocs/langs/et_EE/orders.lang
	htdocs/langs/et_EE/oscommerce.lang
	htdocs/langs/et_EE/other.lang
	htdocs/langs/et_EE/paybox.lang
	htdocs/langs/et_EE/paypal.lang
	htdocs/langs/et_EE/products.lang
	htdocs/langs/et_EE/projects.lang
	htdocs/langs/et_EE/propal.lang
	htdocs/langs/et_EE/sendings.lang
	htdocs/langs/et_EE/shop.lang
	htdocs/langs/et_EE/sms.lang
	htdocs/langs/et_EE/stocks.lang
	htdocs/langs/et_EE/suppliers.lang
	htdocs/langs/et_EE/trips.lang
	htdocs/langs/et_EE/users.lang
	htdocs/langs/et_EE/withdrawals.lang
	htdocs/langs/et_EE/workflow.lang
	htdocs/langs/fa_IR/agenda.lang
	htdocs/langs/fa_IR/banks.lang
	htdocs/langs/fa_IR/bookmarks.lang
	htdocs/langs/fa_IR/boxes.lang
	htdocs/langs/fa_IR/categories.lang
	htdocs/langs/fa_IR/commercial.lang
	htdocs/langs/fa_IR/companies.lang
	htdocs/langs/fa_IR/compta.lang
	htdocs/langs/fa_IR/contracts.lang
	htdocs/langs/fa_IR/deliveries.lang
	htdocs/langs/fa_IR/dict.lang
	htdocs/langs/fa_IR/donations.lang
	htdocs/langs/fa_IR/ecm.lang
	htdocs/langs/fa_IR/errors.lang
	htdocs/langs/fa_IR/exports.lang
	htdocs/langs/fa_IR/ftp.lang
	htdocs/langs/fa_IR/help.lang
	htdocs/langs/fa_IR/install.lang
	htdocs/langs/fa_IR/interventions.lang
	htdocs/langs/fa_IR/languages.lang
	htdocs/langs/fa_IR/ldap.lang
	htdocs/langs/fa_IR/mails.lang
	htdocs/langs/fa_IR/main.lang
	htdocs/langs/fa_IR/members.lang
	htdocs/langs/fa_IR/orders.lang
	htdocs/langs/fa_IR/oscommerce.lang
	htdocs/langs/fa_IR/paybox.lang
	htdocs/langs/fa_IR/paypal.lang
	htdocs/langs/fa_IR/projects.lang
	htdocs/langs/fa_IR/propal.lang
	htdocs/langs/fa_IR/shop.lang
	htdocs/langs/fa_IR/stocks.lang
	htdocs/langs/fa_IR/suppliers.lang
	htdocs/langs/fa_IR/trips.lang
	htdocs/langs/fa_IR/users.lang
	htdocs/langs/fa_IR/withdrawals.lang
	htdocs/langs/fi_FI/agenda.lang
	htdocs/langs/fi_FI/banks.lang
	htdocs/langs/fi_FI/bookmarks.lang
	htdocs/langs/fi_FI/boxes.lang
	htdocs/langs/fi_FI/cashdesk.lang
	htdocs/langs/fi_FI/categories.lang
	htdocs/langs/fi_FI/commercial.lang
	htdocs/langs/fi_FI/companies.lang
	htdocs/langs/fi_FI/compta.lang
	htdocs/langs/fi_FI/contracts.lang
	htdocs/langs/fi_FI/deliveries.lang
	htdocs/langs/fi_FI/dict.lang
	htdocs/langs/fi_FI/donations.lang
	htdocs/langs/fi_FI/errors.lang
	htdocs/langs/fi_FI/exports.lang
	htdocs/langs/fi_FI/externalsite.lang
	htdocs/langs/fi_FI/ftp.lang
	htdocs/langs/fi_FI/install.lang
	htdocs/langs/fi_FI/interventions.lang
	htdocs/langs/fi_FI/languages.lang
	htdocs/langs/fi_FI/mails.lang
	htdocs/langs/fi_FI/members.lang
	htdocs/langs/fi_FI/orders.lang
	htdocs/langs/fi_FI/paybox.lang
	htdocs/langs/fi_FI/paypal.lang
	htdocs/langs/fi_FI/projects.lang
	htdocs/langs/fi_FI/propal.lang
	htdocs/langs/fi_FI/sendings.lang
	htdocs/langs/fi_FI/sms.lang
	htdocs/langs/fi_FI/stocks.lang
	htdocs/langs/fi_FI/suppliers.lang
	htdocs/langs/fi_FI/trips.lang
	htdocs/langs/fi_FI/users.lang
	htdocs/langs/fi_FI/withdrawals.lang
	htdocs/langs/fi_FI/workflow.lang
	htdocs/langs/fr_FR/bookmarks.lang
	htdocs/langs/fr_FR/externalsite.lang
	htdocs/langs/fr_FR/other.lang
	htdocs/langs/fr_FR/paybox.lang
	htdocs/langs/fr_FR/paypal.lang
	htdocs/langs/he_IL/workflow.lang
	htdocs/langs/hu_HU/admin.lang
	htdocs/langs/hu_HU/agenda.lang
	htdocs/langs/hu_HU/banks.lang
	htdocs/langs/hu_HU/bills.lang
	htdocs/langs/hu_HU/boxes.lang
	htdocs/langs/hu_HU/cashdesk.lang
	htdocs/langs/hu_HU/commercial.lang
	htdocs/langs/hu_HU/companies.lang
	htdocs/langs/hu_HU/compta.lang
	htdocs/langs/hu_HU/contracts.lang
	htdocs/langs/hu_HU/deliveries.lang
	htdocs/langs/hu_HU/dict.lang
	htdocs/langs/hu_HU/donations.lang
	htdocs/langs/hu_HU/errors.lang
	htdocs/langs/hu_HU/exports.lang
	htdocs/langs/hu_HU/externalsite.lang
	htdocs/langs/hu_HU/install.lang
	htdocs/langs/hu_HU/interventions.lang
	htdocs/langs/hu_HU/languages.lang
	htdocs/langs/hu_HU/mails.lang
	htdocs/langs/hu_HU/main.lang
	htdocs/langs/hu_HU/members.lang
	htdocs/langs/hu_HU/orders.lang
	htdocs/langs/hu_HU/oscommerce.lang
	htdocs/langs/hu_HU/other.lang
	htdocs/langs/hu_HU/paybox.lang
	htdocs/langs/hu_HU/paypal.lang
	htdocs/langs/hu_HU/projects.lang
	htdocs/langs/hu_HU/propal.lang
	htdocs/langs/hu_HU/sendings.lang
	htdocs/langs/hu_HU/sms.lang
	htdocs/langs/hu_HU/stocks.lang
	htdocs/langs/hu_HU/suppliers.lang
	htdocs/langs/hu_HU/trips.lang
	htdocs/langs/hu_HU/users.lang
	htdocs/langs/hu_HU/withdrawals.lang
	htdocs/langs/hu_HU/workflow.lang
	htdocs/langs/is_IS/agenda.lang
	htdocs/langs/is_IS/banks.lang
	htdocs/langs/is_IS/bookmarks.lang
	htdocs/langs/is_IS/boxes.lang
	htdocs/langs/is_IS/cashdesk.lang
	htdocs/langs/is_IS/categories.lang
	htdocs/langs/is_IS/commercial.lang
	htdocs/langs/is_IS/companies.lang
	htdocs/langs/is_IS/compta.lang
	htdocs/langs/is_IS/contracts.lang
	htdocs/langs/is_IS/deliveries.lang
	htdocs/langs/is_IS/dict.lang
	htdocs/langs/is_IS/donations.lang
	htdocs/langs/is_IS/ecm.lang
	htdocs/langs/is_IS/errors.lang
	htdocs/langs/is_IS/exports.lang
	htdocs/langs/is_IS/externalsite.lang
	htdocs/langs/is_IS/ftp.lang
	htdocs/langs/is_IS/help.lang
	htdocs/langs/is_IS/install.lang
	htdocs/langs/is_IS/interventions.lang
	htdocs/langs/is_IS/languages.lang
	htdocs/langs/is_IS/ldap.lang
	htdocs/langs/is_IS/mails.lang
	htdocs/langs/is_IS/main.lang
	htdocs/langs/is_IS/members.lang
	htdocs/langs/is_IS/orders.lang
	htdocs/langs/is_IS/oscommerce.lang
	htdocs/langs/is_IS/paybox.lang
	htdocs/langs/is_IS/paypal.lang
	htdocs/langs/is_IS/products.lang
	htdocs/langs/is_IS/projects.lang
	htdocs/langs/is_IS/propal.lang
	htdocs/langs/is_IS/sendings.lang
	htdocs/langs/is_IS/shop.lang
	htdocs/langs/is_IS/sms.lang
	htdocs/langs/is_IS/stocks.lang
	htdocs/langs/is_IS/suppliers.lang
	htdocs/langs/is_IS/trips.lang
	htdocs/langs/is_IS/users.lang
	htdocs/langs/is_IS/withdrawals.lang
	htdocs/langs/is_IS/workflow.lang
	htdocs/langs/it_IT/bookmarks.lang
	htdocs/langs/it_IT/cashdesk.lang
	htdocs/langs/it_IT/errors.lang
	htdocs/langs/it_IT/exports.lang
	htdocs/langs/it_IT/externalsite.lang
	htdocs/langs/it_IT/languages.lang
	htdocs/langs/it_IT/paybox.lang
	htdocs/langs/it_IT/paypal.lang
	htdocs/langs/it_IT/projects.lang
	htdocs/langs/it_IT/propal.lang
	htdocs/langs/it_IT/sendings.lang
	htdocs/langs/it_IT/sms.lang
	htdocs/langs/it_IT/workflow.lang
	htdocs/langs/ja_JP/admin.lang
	htdocs/langs/ja_JP/agenda.lang
	htdocs/langs/ja_JP/banks.lang
	htdocs/langs/ja_JP/bills.lang
	htdocs/langs/ja_JP/bookmarks.lang
	htdocs/langs/ja_JP/boxes.lang
	htdocs/langs/ja_JP/cashdesk.lang
	htdocs/langs/ja_JP/categories.lang
	htdocs/langs/ja_JP/commercial.lang
	htdocs/langs/ja_JP/companies.lang
	htdocs/langs/ja_JP/compta.lang
	htdocs/langs/ja_JP/contracts.lang
	htdocs/langs/ja_JP/deliveries.lang
	htdocs/langs/ja_JP/dict.lang
	htdocs/langs/ja_JP/donations.lang
	htdocs/langs/ja_JP/ecm.lang
	htdocs/langs/ja_JP/errors.lang
	htdocs/langs/ja_JP/exports.lang
	htdocs/langs/ja_JP/externalsite.lang
	htdocs/langs/ja_JP/ftp.lang
	htdocs/langs/ja_JP/help.lang
	htdocs/langs/ja_JP/install.lang
	htdocs/langs/ja_JP/interventions.lang
	htdocs/langs/ja_JP/languages.lang
	htdocs/langs/ja_JP/ldap.lang
	htdocs/langs/ja_JP/mails.lang
	htdocs/langs/ja_JP/main.lang
	htdocs/langs/ja_JP/members.lang
	htdocs/langs/ja_JP/orders.lang
	htdocs/langs/ja_JP/oscommerce.lang
	htdocs/langs/ja_JP/other.lang
	htdocs/langs/ja_JP/paybox.lang
	htdocs/langs/ja_JP/paypal.lang
	htdocs/langs/ja_JP/products.lang
	htdocs/langs/ja_JP/projects.lang
	htdocs/langs/ja_JP/propal.lang
	htdocs/langs/ja_JP/sendings.lang
	htdocs/langs/ja_JP/shop.lang
	htdocs/langs/ja_JP/sms.lang
	htdocs/langs/ja_JP/stocks.lang
	htdocs/langs/ja_JP/suppliers.lang
	htdocs/langs/ja_JP/trips.lang
	htdocs/langs/ja_JP/users.lang
	htdocs/langs/ja_JP/withdrawals.lang
	htdocs/langs/ja_JP/workflow.lang
	htdocs/langs/nb_NO/agenda.lang
	htdocs/langs/nb_NO/banks.lang
	htdocs/langs/nb_NO/bookmarks.lang
	htdocs/langs/nb_NO/boxes.lang
	htdocs/langs/nb_NO/cashdesk.lang
	htdocs/langs/nb_NO/categories.lang
	htdocs/langs/nb_NO/commercial.lang
	htdocs/langs/nb_NO/companies.lang
	htdocs/langs/nb_NO/compta.lang
	htdocs/langs/nb_NO/contracts.lang
	htdocs/langs/nb_NO/deliveries.lang
	htdocs/langs/nb_NO/dict.lang
	htdocs/langs/nb_NO/donations.lang
	htdocs/langs/nb_NO/errors.lang
	htdocs/langs/nb_NO/exports.lang
	htdocs/langs/nb_NO/externalsite.lang
	htdocs/langs/nb_NO/ftp.lang
	htdocs/langs/nb_NO/help.lang
	htdocs/langs/nb_NO/install.lang
	htdocs/langs/nb_NO/interventions.lang
	htdocs/langs/nb_NO/languages.lang
	htdocs/langs/nb_NO/ldap.lang
	htdocs/langs/nb_NO/mails.lang
	htdocs/langs/nb_NO/main.lang
	htdocs/langs/nb_NO/members.lang
	htdocs/langs/nb_NO/orders.lang
	htdocs/langs/nb_NO/paybox.lang
	htdocs/langs/nb_NO/paypal.lang
	htdocs/langs/nb_NO/projects.lang
	htdocs/langs/nb_NO/propal.lang
	htdocs/langs/nb_NO/sendings.lang
	htdocs/langs/nb_NO/sms.lang
	htdocs/langs/nb_NO/stocks.lang
	htdocs/langs/nb_NO/suppliers.lang
	htdocs/langs/nb_NO/trips.lang
	htdocs/langs/nb_NO/users.lang
	htdocs/langs/nb_NO/withdrawals.lang
	htdocs/langs/nb_NO/workflow.lang
	htdocs/langs/nl_NL/propal.lang
	htdocs/langs/nl_NL/workflow.lang
	htdocs/langs/pl_PL/agenda.lang
	htdocs/langs/pl_PL/banks.lang
	htdocs/langs/pl_PL/bookmarks.lang
	htdocs/langs/pl_PL/boxes.lang
	htdocs/langs/pl_PL/cashdesk.lang
	htdocs/langs/pl_PL/categories.lang
	htdocs/langs/pl_PL/commercial.lang
	htdocs/langs/pl_PL/companies.lang
	htdocs/langs/pl_PL/compta.lang
	htdocs/langs/pl_PL/contracts.lang
	htdocs/langs/pl_PL/deliveries.lang
	htdocs/langs/pl_PL/dict.lang
	htdocs/langs/pl_PL/donations.lang
	htdocs/langs/pl_PL/errors.lang
	htdocs/langs/pl_PL/exports.lang
	htdocs/langs/pl_PL/externalsite.lang
	htdocs/langs/pl_PL/ftp.lang
	htdocs/langs/pl_PL/install.lang
	htdocs/langs/pl_PL/interventions.lang
	htdocs/langs/pl_PL/languages.lang
	htdocs/langs/pl_PL/mails.lang
	htdocs/langs/pl_PL/members.lang
	htdocs/langs/pl_PL/orders.lang
	htdocs/langs/pl_PL/other.lang
	htdocs/langs/pl_PL/paybox.lang
	htdocs/langs/pl_PL/paypal.lang
	htdocs/langs/pl_PL/projects.lang
	htdocs/langs/pl_PL/propal.lang
	htdocs/langs/pl_PL/sendings.lang
	htdocs/langs/pl_PL/sms.lang
	htdocs/langs/pl_PL/stocks.lang
	htdocs/langs/pl_PL/suppliers.lang
	htdocs/langs/pl_PL/trips.lang
	htdocs/langs/pl_PL/users.lang
	htdocs/langs/pl_PL/withdrawals.lang
	htdocs/langs/pl_PL/workflow.lang
	htdocs/langs/pt_PT/cashdesk.lang
	htdocs/langs/ro_RO/agenda.lang
	htdocs/langs/ro_RO/banks.lang
	htdocs/langs/ro_RO/bookmarks.lang
	htdocs/langs/ro_RO/boxes.lang
	htdocs/langs/ro_RO/cashdesk.lang
	htdocs/langs/ro_RO/commercial.lang
	htdocs/langs/ro_RO/companies.lang
	htdocs/langs/ro_RO/compta.lang
	htdocs/langs/ro_RO/contracts.lang
	htdocs/langs/ro_RO/deliveries.lang
	htdocs/langs/ro_RO/dict.lang
	htdocs/langs/ro_RO/donations.lang
	htdocs/langs/ro_RO/errors.lang
	htdocs/langs/ro_RO/exports.lang
	htdocs/langs/ro_RO/externalsite.lang
	htdocs/langs/ro_RO/interventions.lang
	htdocs/langs/ro_RO/languages.lang
	htdocs/langs/ro_RO/mails.lang
	htdocs/langs/ro_RO/main.lang
	htdocs/langs/ro_RO/members.lang
	htdocs/langs/ro_RO/orders.lang
	htdocs/langs/ro_RO/other.lang
	htdocs/langs/ro_RO/paybox.lang
	htdocs/langs/ro_RO/paypal.lang
	htdocs/langs/ro_RO/projects.lang
	htdocs/langs/ro_RO/propal.lang
	htdocs/langs/ro_RO/sendings.lang
	htdocs/langs/ro_RO/sms.lang
	htdocs/langs/ro_RO/stocks.lang
	htdocs/langs/ro_RO/suppliers.lang
	htdocs/langs/ro_RO/trips.lang
	htdocs/langs/ro_RO/users.lang
	htdocs/langs/ro_RO/withdrawals.lang
	htdocs/langs/ro_RO/workflow.lang
	htdocs/langs/ru_RU/agenda.lang
	htdocs/langs/ru_RU/bills.lang
	htdocs/langs/ru_RU/bookmarks.lang
	htdocs/langs/ru_RU/boxes.lang
	htdocs/langs/ru_RU/companies.lang
	htdocs/langs/ru_RU/compta.lang
	htdocs/langs/ru_RU/contracts.lang
	htdocs/langs/ru_RU/errors.lang
	htdocs/langs/ru_RU/exports.lang
	htdocs/langs/ru_RU/externalsite.lang
	htdocs/langs/ru_RU/install.lang
	htdocs/langs/ru_RU/mails.lang
	htdocs/langs/ru_RU/main.lang
	htdocs/langs/ru_RU/members.lang
	htdocs/langs/ru_RU/orders.lang
	htdocs/langs/ru_RU/paybox.lang
	htdocs/langs/ru_RU/paypal.lang
	htdocs/langs/ru_RU/propal.lang
	htdocs/langs/ru_RU/stocks.lang
	htdocs/langs/ru_UA/main.lang
	htdocs/langs/sl_SI/agenda.lang
	htdocs/langs/sl_SI/boxes.lang
	htdocs/langs/sl_SI/cashdesk.lang
	htdocs/langs/sl_SI/companies.lang
	htdocs/langs/sl_SI/compta.lang
	htdocs/langs/sl_SI/contracts.lang
	htdocs/langs/sl_SI/dict.lang
	htdocs/langs/sl_SI/errors.lang
	htdocs/langs/sl_SI/exports.lang
	htdocs/langs/sl_SI/externalsite.lang
	htdocs/langs/sl_SI/install.lang
	htdocs/langs/sl_SI/languages.lang
	htdocs/langs/sl_SI/mails.lang
	htdocs/langs/sl_SI/main.lang
	htdocs/langs/sl_SI/members.lang
	htdocs/langs/sl_SI/orders.lang
	htdocs/langs/sl_SI/paybox.lang
	htdocs/langs/sl_SI/paypal.lang
	htdocs/langs/sl_SI/propal.lang
	htdocs/langs/sl_SI/sendings.lang
	htdocs/langs/sl_SI/stocks.lang
	htdocs/langs/sl_SI/suppliers.lang
	htdocs/langs/sv_SE/admin.lang
	htdocs/langs/sv_SE/agenda.lang
	htdocs/langs/sv_SE/banks.lang
	htdocs/langs/sv_SE/bookmarks.lang
	htdocs/langs/sv_SE/boxes.lang
	htdocs/langs/sv_SE/cashdesk.lang
	htdocs/langs/sv_SE/categories.lang
	htdocs/langs/sv_SE/commercial.lang
	htdocs/langs/sv_SE/companies.lang
	htdocs/langs/sv_SE/compta.lang
	htdocs/langs/sv_SE/contracts.lang
	htdocs/langs/sv_SE/deliveries.lang
	htdocs/langs/sv_SE/dict.lang
	htdocs/langs/sv_SE/donations.lang
	htdocs/langs/sv_SE/ecm.lang
	htdocs/langs/sv_SE/errors.lang
	htdocs/langs/sv_SE/exports.lang
	htdocs/langs/sv_SE/externalsite.lang
	htdocs/langs/sv_SE/ftp.lang
	htdocs/langs/sv_SE/help.lang
	htdocs/langs/sv_SE/install.lang
	htdocs/langs/sv_SE/interventions.lang
	htdocs/langs/sv_SE/languages.lang
	htdocs/langs/sv_SE/ldap.lang
	htdocs/langs/sv_SE/mails.lang
	htdocs/langs/sv_SE/main.lang
	htdocs/langs/sv_SE/members.lang
	htdocs/langs/sv_SE/orders.lang
	htdocs/langs/sv_SE/oscommerce.lang
	htdocs/langs/sv_SE/other.lang
	htdocs/langs/sv_SE/paybox.lang
	htdocs/langs/sv_SE/paypal.lang
	htdocs/langs/sv_SE/products.lang
	htdocs/langs/sv_SE/projects.lang
	htdocs/langs/sv_SE/propal.lang
	htdocs/langs/sv_SE/sendings.lang
	htdocs/langs/sv_SE/shop.lang
	htdocs/langs/sv_SE/sms.lang
	htdocs/langs/sv_SE/stocks.lang
	htdocs/langs/sv_SE/suppliers.lang
	htdocs/langs/sv_SE/trips.lang
	htdocs/langs/sv_SE/users.lang
	htdocs/langs/sv_SE/withdrawals.lang
	htdocs/langs/sv_SE/workflow.lang
	htdocs/langs/tr_TR/donations.lang
	htdocs/langs/tr_TR/ldap.lang
	htdocs/langs/tr_TR/oscommerce.lang
	htdocs/langs/tr_TR/paybox.lang
	htdocs/langs/tr_TR/paypal.lang
	htdocs/langs/tr_TR/shop.lang
	htdocs/langs/tr_TR/trips.lang
	htdocs/langs/zh_CN/agenda.lang
	htdocs/langs/zh_CN/banks.lang
	htdocs/langs/zh_CN/bookmarks.lang
	htdocs/langs/zh_CN/boxes.lang
	htdocs/langs/zh_CN/cashdesk.lang
	htdocs/langs/zh_CN/commercial.lang
	htdocs/langs/zh_CN/companies.lang
	htdocs/langs/zh_CN/compta.lang
	htdocs/langs/zh_CN/contracts.lang
	htdocs/langs/zh_CN/deliveries.lang
	htdocs/langs/zh_CN/dict.lang
	htdocs/langs/zh_CN/donations.lang
	htdocs/langs/zh_CN/ecm.lang
	htdocs/langs/zh_CN/errors.lang
	htdocs/langs/zh_CN/exports.lang
	htdocs/langs/zh_CN/externalsite.lang
	htdocs/langs/zh_CN/ftp.lang
	htdocs/langs/zh_CN/install.lang
	htdocs/langs/zh_CN/interventions.lang
	htdocs/langs/zh_CN/languages.lang
	htdocs/langs/zh_CN/mails.lang
	htdocs/langs/zh_CN/main.lang
	htdocs/langs/zh_CN/members.lang
	htdocs/langs/zh_CN/orders.lang
	htdocs/langs/zh_CN/oscommerce.lang
	htdocs/langs/zh_CN/paybox.lang
	htdocs/langs/zh_CN/paypal.lang
	htdocs/langs/zh_CN/projects.lang
	htdocs/langs/zh_CN/propal.lang
	htdocs/langs/zh_CN/sendings.lang
	htdocs/langs/zh_CN/shop.lang
	htdocs/langs/zh_CN/sms.lang
	htdocs/langs/zh_CN/stocks.lang
	htdocs/langs/zh_CN/suppliers.lang
	htdocs/langs/zh_CN/trips.lang
	htdocs/langs/zh_CN/users.lang
	htdocs/langs/zh_CN/withdrawals.lang
	htdocs/langs/zh_CN/workflow.lang
	htdocs/langs/zh_TW/banks.lang
	htdocs/langs/zh_TW/bookmarks.lang
	htdocs/langs/zh_TW/boxes.lang
	htdocs/langs/zh_TW/cashdesk.lang
	htdocs/langs/zh_TW/deliveries.lang
	htdocs/langs/zh_TW/ecm.lang
	htdocs/langs/zh_TW/externalsite.lang
	htdocs/langs/zh_TW/oscommerce.lang
	htdocs/langs/zh_TW/paypal.lang
	htdocs/langs/zh_TW/shop.lang
	htdocs/langs/zh_TW/sms.lang
	htdocs/langs/zh_TW/trips.lang
	htdocs/langs/zh_TW/withdrawals.lang
	htdocs/langs/zh_TW/workflow.lang
	scripts/invoices/email_unpaid_invoices_to_customers.php
	scripts/members/sync_members_ldap2dolibarr.php
 2013-07-24 15:51:50 +02:00
Laurent Destailleur
bf9b255c92 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_opensuse.spec
 2013-07-24 15:25:00 +02:00
Laurent Destailleur
cc83ad0b0e Merge remote-tracking branch 'origin/3.4' into develop 2013-07-24 14:15:35 +02:00
Laurent Destailleur
440cfce20b Update doc 2013-07-24 13:58:48 +02:00
Laurent Destailleur
f32bc24285 Fix: Upgrade of package break install 
Conflicts:
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
 2013-07-24 13:49:40 +02:00
Laurent Destailleur
e8400afeba Fix: rpm packages 
Conflicts:
	build/rpm/dolibarr_generic.spec
 2013-07-24 13:46:50 +02:00
Laurent Destailleur
f4987a6fa5 Fix: Upgrade of package break install 2013-07-24 13:44:08 +02:00
Laurent Destailleur
7ae06c6f45 Fix: rpm packages 2013-07-24 12:15:24 +02:00
Laurent Destailleur
09fd904e76 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/ecm/index.php
 2013-07-19 14:01:47 +02:00
Laurent Destailleur
442c2cab8f Update doc 2013-07-19 13:42:19 +02:00
Laurent Destailleur
306f6dd839 Updrage to tcpdf 6.0.021 2013-07-19 00:14:30 +02:00
Laurent Destailleur
f6f14a6227 Update readme to explain how to update tcpdf debian package. 2013-07-17 21:45:05 +02:00
Laurent Destailleur
cc124e03c1 Fix: Missing comma 2013-07-14 03:38:07 +02:00
Laurent Destailleur
2c0a01fc8c Merge remote-tracking branch 'origin/3.4' into develop 2013-07-11 17:57:06 +02:00
Laurent Destailleur
4c39bc9997 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-07-10 23:05:13 +02:00
Laurent Destailleur
8f71e5fda2 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	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-07-07 23:25:03 +02:00
Laurent Destailleur
a687cc429c Update doc for 3.4 2013-07-07 13:35:29 +02:00
Laurent Destailleur
b16689e8b7 Prepare 3.4 2013-07-07 13:32:45 +02:00
Laurent Destailleur
0de1fe893a Prepare 3.4 2013-07-07 13:30:30 +02:00
Laurent Destailleur
5385d87995 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/ca_ES/errors.lang
	htdocs/langs/ca_ES/main.lang
	htdocs/langs/ca_ES/opensurvey.lang
	htdocs/langs/ca_ES/paybox.lang
	htdocs/langs/ca_ES/products.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/langs/es_ES/main.lang
	htdocs/langs/es_ES/products.lang
 2013-07-05 21:56:54 +02:00
Laurent Destailleur
99210a1501 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 
Conflicts:
	build/debian/control
 2013-07-03 16:29:05 +02:00
Laurent Destailleur
c1abd26a60 Fix: Package name for wheezy 2013-07-03 16:12:17 +02:00
Laurent Destailleur
b52dd70229 Fix: Missing dependency 2013-07-02 14:21:05 +02:00
Raphaël Doursenaud
b9ff5188b3 Normalized EOL 2013-07-01 12:00:42 +02:00
Laurent Destailleur
11193dd9b8 Updates for cpp files 2013-06-30 22:00:04 +02:00
Laurent Destailleur
af4651f1a2 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/perl/virtualmin/dolibarr.pl
	htdocs/core/lib/files.lib.php
	htdocs/langs/en_US/projects.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/webservices/server_other.php
 2013-06-25 23:22:00 +02:00
Laurent Destailleur
8359a34545 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/perl/virtualmin/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/class/facture-rec.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/filefunc.inc.php
 2013-06-25 21:31:24 +02:00
Laurent Destailleur
187feff7d5 Prepare 3.3.3 2013-06-25 20:40:22 +02:00
Cédric Salvador
b747b0349d merge 2013-06-06 18:31:33 +02:00
Laurent Destailleur
5bba5782a4 Merge remote-tracking branch 'origin/3.4' into develop 2013-05-29 21:22:27 +02:00
Laurent Destailleur
3cba6e71cc Fix: bad name file 2013-05-29 11:42:24 +02:00
Laurent Destailleur
2878d6f423 Fix version 2013-05-29 01:32:56 +02:00
Laurent Destailleur
1cb33c43bd Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/comm/action/listactions.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/agenda.lib.php
	htdocs/product/liste.php
 2013-05-29 01:30:36 +02:00
Laurent Destailleur
ff5a900ea3 Work on automation of transifex 2013-05-26 14:13:49 +02:00
Laurent Destailleur
2e8d2b884f Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-05-26 13:31:11 +02:00
Laurent Destailleur
c66304e217 Fix: Update version 2013-05-26 13:20:37 +02:00
Laurent Destailleur
1a3a749ccb Merge remote-tracking branch 'origin/3.4' into develop 2013-05-24 19:12:17 +02:00
Laurent Destailleur
7b29e58760 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
 2013-05-24 19:07:20 +02:00
Laurent Destailleur
02facd0a7e Update doc 2013-05-23 22:37:07 +02:00
Laurent Destailleur
7856b7f613 Removed warning 2013-05-22 15:52:26 +02:00
Laurent Destailleur
9e847884d1 Prepare dev branch 2013-05-03 18:41:14 +02:00
Laurent Destailleur
97de97de9d Prepare branch 3.4 2013-05-03 10:17:46 +02:00
Laurent Destailleur
16fbe72f69 Fix: Fedora rules 2013-05-02 23:36:32 +02:00
Laurent Destailleur
3dd920d92a Use redhat rule for licence name 2013-05-01 13:37:33 +02:00
Laurent Destailleur
3daac1d7ab Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-05-01 13:35:01 +02:00
Laurent Destailleur
c02f8e689e Restore standard postinst file 2013-05-01 00:24:03 +02:00
Laurent Destailleur
786bf9d035 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-30 22:39:17 +02:00
Laurent Destailleur
4e072e6229 Doc 2013-04-30 20:14:40 +02:00
Laurent Destailleur
761b2d05d4 Fix: delete of files with [ and glob. 2013-04-30 17:24:11 +02:00
Laurent Destailleur
74e7dc319d Fix: package adodb and nusoap not available on opensuse 2013-04-24 16:52:17 +02:00
Laurent Destailleur
d3d2ffe43e Qual: A better error management for suse rpm package 2013-04-24 16:16:41 +02:00
Laurent Destailleur
08808c58cd Prepare 3.3.2 2013-04-24 14:46:50 +02:00
Laurent Destailleur
304cf641c0 Prepare 3.4 2013-04-24 14:39:34 +02:00
Laurent Destailleur
7dce8d2306 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/launchpad/README
	build/makepack-dolibarr.pl
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/core/modules/syslog/mod_syslog_file.php
	htdocs/filefunc.inc.php
	htdocs/product/class/product.class.php
 2013-04-23 14:04:56 +02:00
Laurent Destailleur
365a5e18e8 Prepare 3.3.2 2013-04-23 13:56:59 +02:00
Laurent Destailleur
57ab4fb798 Fix doc 2013-04-23 13:38:00 +02:00
Laurent Destailleur
624a039eaf Update debian doc 2013-04-23 12:58:58 +02:00
Laurent Destailleur
8f502b8cfc Prepare 3.3.2 2013-04-23 12:39:55 +02:00
Laurent Destailleur
dbc2eddcba Prepare for 3.3.2 2013-04-23 12:09:21 +02:00
Laurent Destailleur
c8bc0a1ec9 New: Prepare to code to support jmobile. 2013-04-01 23:38:39 +02:00
Laurent Destailleur
e51c72f1e8 Merge 2013-03-04 00:10:09 +01:00
Laurent Destailleur
924d01249c Prepare 3.3.1 maintenance release 2013-03-02 16:12:06 +01:00
Laurent Destailleur
bf0e4d73d0 Fix launchpad conflicts 2013-03-01 10:04:50 +01:00
Laurent Destailleur
5075e9c716 Update to 3.4 2013-03-01 09:55:04 +01:00
Laurent Destailleur
9106a74426 Fix: Package for launchpad 2013-03-01 09:48:03 +01:00
eldy
bfc4df5169 protection to avoid to take external modules 2013-02-21 20:23:39 +01:00
Laurent Destailleur
b21cb5b899 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	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.php
	htdocs/filefunc.inc.php
 2013-02-17 17:25:38 +01:00
Laurent Destailleur
b0695d3bbb Preapre 3.3 2013-02-17 17:20:05 +01:00
Laurent Destailleur
df2fde3a68 Prepare 3.3 release 2013-02-17 17:17:19 +01:00
Laurent Destailleur
5597e1b5c2 Protection to avoid not desired modules into packages 2013-01-19 18:47:35 +01:00
Laurent Destailleur
0c418160b9 Fix: exclude files 2013-01-17 20:56:13 +01:00
Laurent Destailleur
2b8aa54f68 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-17 10:32:49 +01:00
Laurent Destailleur
b158758e7c Fix: Missing exclude dir 2013-01-17 10:32:00 +01:00
Laurent Destailleur
9134dfc896 Prepare 3.4 2013-01-17 10:25:40 +01:00
Laurent Destailleur
c222f39c76 Prepare 3.4 2013-01-17 10:22:26 +01:00
Laurent Destailleur
dddcc0b424 Update doc 2013-01-16 21:31:27 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
 2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
Laurent Destailleur
7bd6a0c1e3 Update doc 2013-01-16 12:30:39 +01:00
Laurent Destailleur
1d95c68a74 Update 2013 2013-01-13 14:38:05 +01:00
Laurent Destailleur
a415a988a3 Fix: Packaging of doliwamp 2013-01-09 15:19:00 +01:00
Laurent Destailleur
4099b98540 Prepare 3.3 release 2013-01-09 14:55:24 +01:00
Laurent Destailleur
f2af70628d Prepare 3.3 release 2013-01-09 14:43:55 +01:00
Laurent Destailleur
5aeec9eab2 Fix: line into theme 2013-01-08 16:46:06 +01:00
Laurent Destailleur
53ee487358 Fix: Use standard syntax for version 2012-12-31 13:40:35 +01:00
Laurent Destailleur
6b6f725f99 Update doc file 2012-12-31 03:13:11 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Laurent Destailleur
9b95b3e891 Fix: opensuse package 2012-12-21 17:21:50 +01:00
Laurent Destailleur
e4855e153b Fix: Comment 2012-12-20 11:38:26 +01:00
Laurent Destailleur
5541d1bf42 Prepare 3.3 packaging 2012-12-19 21:11:35 +01:00
Laurent Destailleur
19d5458ded Prepare freeze of 3.3 2012-12-18 14:21:56 +01:00
Laurent Destailleur
bee97a6b3b Restore another lost commit. 
Fix: Restore compatibility with FPDF.

Conflicts:
	htdocs/core/lib/pdf.lib.php
 2012-12-05 00:47:20 +01:00
Laurent Destailleur
09bb10b2a6 Restore lost commit 2012-12-01 15:50:39 +01:00
Laurent Destailleur
4136c27516 RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50 
commits !
 2012-12-01 15:45:05 +01:00
Laurent Destailleur
624c0fa040 Fix: Restore compatibility with FPDF. 2012-11-30 20:31:43 +01:00
Laurent Destailleur
f4f627f3be Fix typo 2012-11-17 11:51:20 +01:00
Laurent Destailleur
19b7cc66d5 Qual: Remove hidden option so is not efficient and not used files. 
Qual: Uniformize code
 2012-11-17 11:48:51 +01:00
Laurent Destailleur
365c0397f6 Doc 2012-11-07 20:04:33 +01:00
Laurent Destailleur
066d72b5ec typo error 2012-11-07 13:59:26 +01:00
Laurent Destailleur
f6d9b2abe3 New: Add hidden option MAIN_PDF_MARGIN_LEFT, MAIN_PDF_MARGIN_RIGHT, 
MAIN_PDF_MARGIN_TOP, MAIN_PDF_MARGIN_BOTTOM to force margins of
generated PDF.
Qual: Use 2 different var for reserver footer height and free text
height.
 2012-10-31 13:48:59 +01:00
Laurent Destailleur
f0f3fc1172 Clean rpm packagers 2012-10-29 09:46:15 +01:00
Laurent Destailleur
aefbebe833 Start README to describe usage of OBS packaging platform 2012-10-24 02:15:47 +02:00
Laurent Destailleur
485fab7478 Try to fix warning of warning of buildroot and desktop into packaging 2012-10-23 23:45:32 +02:00
Laurent Destailleur
92656e2b4f New: Add more info 2012-10-22 21:37:18 +02:00
Laurent Destailleur
4f15029b13 Update spec 2012-10-22 20:34:02 +02:00
Laurent Destailleur
07149b548c Fix: Another bad dir 2012-10-22 13:40:11 +02:00
Laurent Destailleur
50113dd513 Fix: Bad path 2012-10-22 13:17:48 +02:00
Laurent Destailleur
eaad5f075e Fix: Some fix to removed refused controls by distrib package build 
systems.
 2012-10-22 13:08:55 +02:00
Laurent Destailleur
6ef90b169a Typo error 2012-10-22 11:13:35 +02:00
Laurent Destailleur
38dbf74688 Fix: Perm on files 2012-10-19 01:37:48 +02:00
Laurent Destailleur
4a811a8cdf Fix: missing defattr 2012-10-19 00:48:27 +02:00
Laurent Destailleur
7e5f94d908 Update packagers 2012-10-18 23:33:22 +02:00
Laurent Destailleur
68ecc5eb89 Upgrade doliwamp 2012-10-08 02:38:30 +02:00
Laurent Destailleur
f9ceb78f58 Beautify instal pg. 
Fix: Debian package
 2012-10-07 20:04:07 +02:00
Laurent Destailleur
18da651975 Update logo 2012-10-07 15:21:52 +02:00
Laurent Destailleur
4a9db063c2 Fi: Uninstall not complete 2012-10-01 20:58:39 +02:00
Laurent Destailleur
434fb1f79f Update doc 2012-09-26 13:35:08 +02:00
Laurent Destailleur
8613dcd26e Add specific README.md for DoliWamp directory of sourceforge. 2012-09-01 19:15:08 +02:00
Regis Houssin
f21fda248b Fix: update virtualmin script 2012-08-31 11:55:53 +02:00
Laurent Destailleur
28d8431159 Fix: Packaging for 3.2.1 of zip 2012-08-29 12:40:49 +02:00
Laurent Destailleur
74d7bc0c06 Update pad 2012-08-11 13:04:38 +02:00
Laurent Destailleur
0d346ac1c1 New: A module can add several css and several js. 
New: Removed lightbox as it is not compatible with GPL.
 2012-08-08 20:43:23 +02:00
Laurent Destailleur
22b0261bc7 Update DoliWamp packager 2012-08-05 01:06:37 +02:00
Laurent Destailleur
82744c0020 Update packager 2012-08-04 01:10:12 +02:00
Laurent Destailleur
2020d6ae00 Fix: debian rules must use tabs 2012-08-04 00:30:30 +02:00
Laurent Destailleur
377b1716ef Fix: permission execute on perl script 
Fix: Checkstyle
 2012-08-04 00:17:34 +02:00
Laurent Destailleur
71f3ff8e33 To match debian rules 2012-07-29 13:30:13 +02:00
Laurent Destailleur
bcae9b5c8b Fix: [ bug #463 ] makepack-dolibarrmodule.pl truncates version 2012-07-23 11:22:03 +02:00
Laurent Destailleur
c68476d93e Prepare 3.2 release 2012-07-07 20:21:58 +02:00
Regis Houssin
4bafa13b5a New: check the real version and remove specific php settings 2012-07-02 20:57:22 +02:00
Laurent Destailleur
f4e30f4fcc Use stable url. 2012-06-30 01:45:39 +02:00
Laurent Destailleur
e734a3cdca Fix: filename must be case sensitive 2012-06-24 13:15:39 +02:00
Laurent Destailleur
42c25a4c0c Update doc 2012-06-17 22:28:52 +02:00
Laurent Destailleur
1e039bb708 Update doc 2012-06-17 19:22:09 +02:00
Laurent Destailleur
5e2f846894 Missing fpdfi 2012-06-13 20:21:43 +02:00
Laurent Destailleur
a5702e150c Enable jflot lib 2012-06-12 00:55:09 +02:00
Regis Houssin
94103af605 Fix: don't exclude savant and jstree for externals modules ! 2012-06-04 11:21:20 +02:00
Laurent Destailleur
89e95f8d97 Fix: Do not use correct env var 2012-05-14 01:47:26 +02:00
Laurent Destailleur
0135129b9b Fix: Regression in packager 2012-05-09 00:04:32 +02:00
Laurent Destailleur
fcd4de888f Fix: Use correct dest dir. 2012-05-03 23:14:32 +02:00
Laurent Destailleur
fecab54f43 Checkstyle 2012-04-30 15:17:50 +02:00
Laurent Destailleur
8ea079ed96 New: Prepare change to allow usage of print sheet for any purpose (not 
only
memeber module).
Qual: Remove duplicate declaration of version.
 2012-04-28 16:37:58 +02:00
Laurent Destailleur
956215fc0a Fix: Script to build package for doliwamp is now ok. 2012-04-18 17:19:53 +02:00
Laurent Destailleur
ebc9cc2ad7 Fix: Some bug into rpm and debian packaging. 2012-04-14 15:41:34 +02:00
Laurent Destailleur
74d5f5e295 Fix: Work on debian 6 2012-04-14 02:49:48 +02:00
Laurent Destailleur
e55d7d92cc Fix: plugin not into debian 2012-04-14 01:23:51 +02:00
Laurent Destailleur
716f9d8786 Fix: Avoid error when removing not correctly installed package 2012-04-13 20:16:48 +02:00
Regis Houssin
153cdb53e8 Fix: update version 2012-04-12 08:36:01 +02:00
Laurent Destailleur
1ec9125ff9 Move to 3.3 alpha 2012-04-09 16:51:17 +02:00
Laurent Destailleur
8c5aea6cde Prepare 3.2 2012-04-04 21:24:16 +02:00
Laurent Destailleur
cbe2e3c15c Preapre 3.2.0 2012-04-04 17:54:11 +02:00
Laurent Destailleur
7af701af4a odt templates for invoices are included 2012-03-28 16:53:18 +02:00
Regis Houssin
973146ee46 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-28 16:16:51 +02:00
Regis Houssin
892a8d258e Fix: insert bureau2crea 2012-03-28 15:31:49 +02:00
Laurent Destailleur
1d10db673a Add instruction to add debian repository 2012-03-28 14:59:56 +02:00
Laurent Destailleur
9f9c2ef5ca Better test 2012-03-27 09:40:08 +02:00
Laurent Destailleur
260aa99904 Echo message 2012-03-23 09:47:53 +01:00
Laurent Destailleur
39332c56b7 Update doc 2012-03-19 11:51:34 +01:00
Laurent Destailleur
2e01888ce8 Work on debian package 2012-03-18 23:23:17 +01:00
Laurent Destailleur
ed41e03589 Qual: Fix a ton of CheckStyle errors 2012-03-18 19:23:01 +01:00
Laurent Destailleur
17f43fabe0 Update doc 2012-03-05 13:01:03 +01:00
Laurent Destailleur
ce5aabd345 Add name of var 2012-02-29 17:10:45 +01:00
Laurent Destailleur
9a3971d77f Update doc 2012-02-21 01:37:03 +01:00
Laurent Destailleur
db7ac346e8 Update doc 2012-02-20 10:59:32 +01:00
Laurent Destailleur
17512cfc48 Work on deb/rpm package 2012-02-18 15:21:59 +01:00
Laurent Destailleur
61175c2543 Work on debian/rpm package 2012-02-18 14:55:41 +01:00
Laurent Destailleur
7b175e3b52 Work on rpm packages 2012-02-18 13:05:20 +01:00
Laurent Destailleur
7afcee03b9 Work on debian package 2012-02-18 03:29:43 +01:00
Laurent Destailleur
6f9d53df2d Exclude quickbuild file from packages 2012-02-17 09:49:51 +01:00
Laurent Destailleur
c6e1392f06 Removed useless excludes 2012-02-17 09:48:48 +01:00
Laurent Destailleur
0011b1dadd New: Trigger now have a priority to define sort execution order. 2012-01-31 20:32:26 +01:00
Laurent Destailleur
761def3cc0 Work on debian package 2012-01-30 23:57:55 +01:00
Laurent Destailleur
8c934d3dde Rename custom code into customs code 2012-01-30 20:08:11 +01:00
Laurent Destailleur
2a90f17717 Update doc 2012-01-30 01:31:00 +01:00
Laurent Destailleur
aefc8c6545 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	build/launchpad/README
 2012-01-30 00:44:29 +01:00
Laurent Destailleur
e5d564b40f Work on debian package 2012-01-30 00:42:47 +01:00
Laurent Destailleur
6055a758b0 Work on debian package 2012-01-30 00:05:36 +01:00
Laurent Destailleur
63c3cb2d48 Work on debian package 2012-01-29 20:57:40 +01:00
Laurent Destailleur
429ba54e3e Work on debian package 2012-01-28 16:04:48 +01:00
Laurent Destailleur
a072c498dd Work on debian package 2012-01-28 00:36:46 +01:00
Laurent Destailleur
1b4d89a67a Start doc about launchpad package 2012-01-23 12:37:53 +01:00
Laurent Destailleur
eafe6ee664 Removed all useless code for packagers 2012-01-20 00:17:16 +01:00
Laurent Destailleur
7c8cda5de3 Update package 2012-01-19 20:43:47 +01:00
Laurent Destailleur
59619517e3 Work on debian packages 2012-01-14 12:58:42 +01:00
Laurent Destailleur
382c6554b4 New: Work on debian packaging to use default ckeditor package 2012-01-14 02:06:05 +01:00
Regis Houssin
f3e5774469 Fix: uniform jenkins filename 2012-01-08 09:02:47 +01:00
Laurent Destailleur
4c0d7378d3 Some change to prepare artichow removal 2012-01-07 21:32:35 +01:00
Laurent Destailleur
bb58c0e325 Update doc 2012-01-05 01:20:54 +01:00
Laurent Destailleur
69c4cbd872 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-01-04 19:33:55 +01:00
Laurent Destailleur
cf6e0b7380 Try to removed hard coded values. Seems to work for me. 2012-01-04 13:41:55 +01:00
Regis Houssin
fa4847f304 Fix: update virtualmin with 3.1.0 2012-01-04 08:41:40 +01:00
Regis Houssin
5e67c11bc8 Fix: missing barcode module 2011-12-22 18:32:37 +01:00
Laurent Destailleur
61facaf7db Fix: debian package 2011-12-15 23:41:49 +01:00
Laurent Destailleur
3f03a82e89 Update copyright files 2011-12-10 14:19:03 +01:00
Laurent Destailleur
14c61e5cb4 Fix: move font 2011-12-05 09:56:38 +01:00
Laurent Destailleur
c8a79c8dac Update exclude 2011-12-04 13:11:01 +01:00
Laurent Destailleur
9d1a008768 Qual: Clean code for barcode 2011-11-27 22:55:49 +01:00
Laurent Destailleur
8a498774bf Can choose nusoap library path. 
Work on debian package.
 2011-11-27 02:06:48 +01:00
Laurent Destailleur
57e5f3b28b Fix: version 2011-11-26 00:57:59 +01:00
Laurent Destailleur
163a0c5db2 Fix: restore rpm packaging 2011-11-13 12:29:33 +01:00
Laurent Destailleur
3219ab4e0a Move doxygen files into doxygen dir 2011-11-12 18:20:59 +01:00
Regis Houssin
c9ea31a9d5 Fix: remove unused files 
Fix: add datatables library in package
 2011-11-07 17:05:06 +01:00
Laurent Destailleur
8d265ed1f9 Fix message 2011-11-06 00:31:44 +01:00
Laurent Destailleur
57163e122a Delete file 2011-10-31 11:53:45 +01:00
Laurent Destailleur
c3aafe05a8 Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into develop 
Conflicts:
	htdocs/core/js/datepicker.js.php
 2011-10-30 23:43:39 +01:00
Regis Houssin
dea1210c2d Fix: edit in place datepicker more stable 2011-10-28 19:31:42 +02:00