2
0
forked from Wavyzz/dolibarr

Compare commits

..

760 Commits

Author SHA1 Message Date
Laurent Destailleur
d8aa8051dc Fix: Personalizing css fails when multicompany is on. Cache must differ
between each environment.
2012-12-08 18:42:29 +01:00
Laurent Destailleur
a7e1a45571 Fix: Use different css cache file for each user. This fix problem when
using personalised constants that change style.
2012-12-08 18:40:41 +01:00
Laurent Destailleur
60486417c3 Test. Try to create a backport branch. 2012-12-02 19:55:42 +01:00
Laurent Destailleur
c9ee9c7a38 Fix: pdf_getPDFFontSize must be after pdf_getInstance
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
2012-11-28 19:26:08 +01:00
Laurent Destailleur
8f3f28c28f Fix: language translation for araby saudia 2012-11-27 14:19:04 +01:00
Laurent Destailleur
ac8a21a3d9 Added english (arabi saudia) 2012-11-27 11:34:15 +01:00
Laurent Destailleur
769c30de9d Fix: [ bug #607 ] Nom de société avec guillemets 2012-11-26 16:12:30 +01:00
Laurent Destailleur
2b926978ae Fix: Correct vat 2012-11-14 20:50:00 +01:00
Laurent Destailleur
6540451078 Fix: firstname was missing 2012-11-14 19:04:34 +01:00
Laurent Destailleur
3ea1345a5b Fix: Option MAIN_MAIL_SENDMAIL_FORCE_BA and MAIN_FIX_BUGGED_MTA was not
complete.
2012-11-14 01:22:48 +01:00
Laurent Destailleur
0d35892003 Fix: typo error 2012-11-13 11:14:44 +01:00
Regis Houssin
8a8c2170cc Fix: remove unused code 2012-11-12 09:44:41 +01:00
Laurent Destailleur
599300dfec Fix: Regression 2012-11-11 15:44:23 +01:00
Regis Houssin
1e6e7af9f7 Fix: wrong access rights 2012-11-10 08:21:56 +01:00
Laurent Destailleur
56cd154258 Fix: New vat for switzerland 2012-11-08 12:14:44 +01:00
Regis Houssin
2f476aa0a0 Fix: compatibility with multicompany 2012-11-06 14:54:17 +01:00
Laurent Destailleur
47d7ea1813 Removed tables of module 2012-11-06 12:29:45 +01:00
Laurent Destailleur
47d5c5baad Fix: Bad label when validating/paying an invoice from POS module 2012-11-03 17:01:05 +01:00
Laurent Destailleur
91fdb6a569 Fix: Not enought space for free text. To avoid to edit again and again
value for all templates, I added an option to be able to fix template
onto production when space is not enough.

Conflicts:
	htdocs/core/modules/action/rapport.pdf.php
	htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
	htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/project/pdf/pdf_baleine.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
2012-11-03 13:41:33 +01:00
Laurent Destailleur
1997b029c7 Fix: [ bug #592 ] stock sold value is wrong 2012-11-03 12:38:16 +01:00
Laurent Destailleur
753400ccf5 Fix: Label for payment by cheque using the wrong translation key
Fix: Option to overwrite translation did not work as expected
Fix: Bad translation for greece
2012-11-02 15:46:46 +01:00
Laurent Destailleur
b83a4d4815 Fix: crazy pagebreak when warterwark is higher than free space. 2012-11-02 15:44:34 +01:00
Laurent Destailleur
8127ced19b Fix: Trick to solve easily problem of font for some foreign users. 2012-10-31 19:42:16 +01:00
Laurent Destailleur
8bd2f9cfb5 Fix: Fix pagebreak. Fix also position for non A4 format. 2012-10-31 17:14:11 +01:00
Laurent Destailleur
0b3a2b744e Fix: Preview of delivery receipts 2012-10-31 16:57:48 +01:00
Laurent Destailleur
cd992d553e Fix: The bottom margin is already included into heightforfooter
This provide 1cm more for product description.
Fix: Some code was not merged from previous fix (must not show free text
on all pages)

Conflicts:
	htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
	htdocs/core/modules/livraison/pdf/pdf_sirocco.modules.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
2012-10-30 18:52:55 +01:00
Laurent Destailleur
db00ca9dd7 Fix: Free text overlap data when not on last page.
Conflicts:
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
	htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
	htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
	htdocs/core/modules/livraison/pdf/pdf_sirocco.modules.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/project/pdf/pdf_baleine.modules.php
2012-10-30 14:15:35 +01:00
Laurent Destailleur
542dc8f98f Fix: Bad code for specimen 2012-10-30 11:58:38 +01:00
Laurent Destailleur
497aa9c453 Fix: Using a more precise function to calculate free texts height avoid
having few pixels offset on free texts.
2012-10-30 11:15:37 +01:00
Laurent Destailleur
c80badafe0 Fix: Revert direction of option (this information is a legal issue for
most countries). Also, i removed the mandatory test, this is required
for invoices, not proposals.
So now, there is no need to hide by default because test on invoice
setup has been removed, so we can show by default (if defined) and use
option to force to hide if we want.
2012-10-29 11:38:58 +01:00
Regis Houssin
3aebd50d39 Fix: better for show signature 2012-10-29 10:10:05 +01:00
Regis Houssin
85f03913fe Merge pull request #460 from FHenry/3.2
3.2
2012-10-24 13:57:36 -07:00
fhenry
a3260f3e14 Correct bug 583 2012-10-24 22:45:28 +02:00
Laurent Destailleur
825130d633 Fix: ldap errors 2012-10-24 16:30:10 +02:00
fhenry
1d66d97032 Task 581 : Implement DDLInfoTable for postgreSQL 2012-10-24 11:20:40 +02:00
Laurent Destailleur
df4bfc77a4 Fix: Line at bottom of PDF was too long 2012-10-21 16:11:46 +02:00
Laurent Destailleur
8fe8a1a6fd Fix: Bad alignement of fields with some page format. 2012-10-21 15:58:01 +02:00
Regis Houssin
6fe9a8ee0d Fix: wrong method 2012-10-20 11:13:22 +02:00
Regis Houssin
7e94d8ae52 Fix: minor vulnerabilities 2012-10-20 09:05:24 +02:00
Laurent Destailleur
878d5612a1 Fix: [ bug #260 ] Page breaks on PDF export of supplier order when you
have a service with 40 lines
2012-10-18 12:36:20 +02:00
Laurent Destailleur
377d6dc290 Fix: Bad date format 2012-10-17 20:12:45 +02:00
Laurent Destailleur
2b9f4fed8d Merge branch '3.2' of https://github.com/Dolibarr/dolibarr.git into 3.2 2012-10-16 19:49:11 +02:00
Laurent Destailleur
890579d13d Fix: [ bug #565 ] Display error bills have suppliers. 2012-10-16 19:14:47 +02:00
Laurent Destailleur
3dab78afb7 [ bug #552 ] l'option "Adhérents non à jour" ne fonctionne pas 2012-10-16 18:34:07 +02:00
Regis Houssin
d9ebc43cb6 Fix: compatibility with multicompany sharings 2012-10-16 17:53:37 +02:00
Regis Houssin
6d85629495 Fix: possibility to disable ajax 2012-10-16 16:15:00 +02:00
Laurent Destailleur
0e12931d0f Fix: error management 2012-10-15 21:43:42 +02:00
Laurent Destailleur
9690a0bc69 Fix: special_code=3 2012-10-12 22:18:02 +02:00
Laurent Destailleur
8b02d9e912 Fix: Can edit qty of an option 2012-10-12 21:37:06 +02:00
Laurent Destailleur
399aaf1459 Fix: warning 2012-10-05 09:33:01 +02:00
Laurent Destailleur
e707f73067 Fix: getTrad 2012-10-04 10:04:08 +02:00
Laurent Destailleur
8506df28d7 Fix: Try another fix on getTrad bug. 2012-10-04 09:44:55 +02:00
Laurent Destailleur
2868961661 Fix: TZ 2012-10-03 18:36:22 +02:00
Laurent Destailleur
ae945732be Fix: getTradFromKey 2012-10-03 17:48:56 +02:00
Laurent Destailleur
10e72d70ae Merge branch '3.2' of https://github.com/Dolibarr/dolibarr.git into 3.2 2012-10-01 20:52:50 +02:00
Laurent Destailleur
fa1d8a3f34 Fi: Uninstall not complete 2012-10-01 20:50:07 +02:00
Laurent Destailleur
6600993796 Prepare 3.3 2012-10-01 20:49:19 +02:00
Laurent Destailleur
bcc92dbd62 Fix: Correct request with data structure 2012-10-01 20:48:51 +02:00
Regis Houssin
ad3fd83478 Merge pull request #427 from simnandez/3.2
Fix: [ bug #553 ] Pagination dans liste des interventions
2012-10-01 02:26:55 -07:00
simnandez
2763374ff1 Fix: [ bug #553 ] Pagination dans liste des interventions 2012-10-01 11:23:16 +02:00
Regis Houssin
a2fecc2616 Fix: remove errors in php 5.4 2012-09-30 14:10:12 +02:00
Laurent Destailleur
4ecf7d9493 Merge branch '3.2' of https://github.com/Dolibarr/dolibarr.git into 3.2 2012-09-27 18:33:29 +02:00
Laurent Destailleur
f9dfe1bcfb Fix: No error when hour not provided
Conflicts:
	htdocs/core/lib/functions.lib.php
2012-09-27 18:31:47 +02:00
Regis Houssin
a119cd3f36 Fix: remove warning 2012-09-27 15:20:23 +02:00
Laurent Destailleur
c019857bda Merge branch '3.2' of git@github.com:Dolibarr/dolibarr.git into 3.2 2012-09-26 13:38:10 +02:00
Laurent Destailleur
b020dbf96f Prepare 3.3.3 2012-09-26 13:35:18 +02:00
Regis Houssin
1185e0f731 Fix: multicompany transverse mode compatibility 2012-09-26 12:14:08 +02:00
Regis Houssin
d6243a33af Fix: hide menu if empty 2012-09-26 12:12:01 +02:00
Regis Houssin
e9128db1aa Fix: add todo for free tag treatment 2012-09-25 18:37:37 +02:00
Regis Houssin
e8c9a9c87d Merge pull request #416 from cbattarel/3.2
add ability to remove a product tab if it's defined in a module description
2012-09-25 07:04:13 -07:00
Christophe Battarel
80c6716581 add ability to remove a product tab if it's defined in a module description 2012-09-25 14:46:40 +02:00
Laurent Destailleur
9de912ba12 Fix: doxygen 2012-09-24 21:40:26 +02:00
Regis Houssin
930f492a14 Fix: use company name if lastname and firstname not exists 2012-09-24 12:05:12 +02:00
Regis Houssin
665526a6e7 Fix: dol_trunk is too restrictive !!! change the resolution of your
screen !
2012-09-24 11:32:29 +02:00
Regis Houssin
0ac5f38e02 Fix: increase length, is too restrictive
Fix: show company name if lastname and firstname not exists
2012-09-24 10:53:35 +02:00
Spangaro Alexandre
4a9bf30bd1 Minor fix
Conflicts:
	htdocs/install/mysql/data/llx_accounting.sql
2012-09-23 16:34:30 +02:00
Laurent Destailleur
89908052c0 Add PHPUnit to help to detect bugs. 2012-09-23 16:21:37 +02:00
Laurent Destailleur
53c1672b9f Fix: Blank page when renaming product ref 2012-09-19 14:16:39 +02:00
Laurent Destailleur
8b13f2ab81 Fix: no way to change the payment term date 2012-09-18 12:11:16 +02:00
Laurent Destailleur
f1870ae37d Fix: syntax error with postgresql 2012-09-18 11:24:54 +02:00
Laurent Destailleur
592d70d4ea Fix: use https if https is used 2012-09-18 11:15:40 +02:00
Laurent Destailleur
218ae3dbd5 Merge branch '3.2' of git@github.com:Dolibarr/dolibarr.git into 3.2 2012-09-15 15:13:10 +02:00
Laurent Destailleur
b7163bea5d Fix: avoid syntax error 2012-09-15 15:12:43 +02:00
Regis Houssin
01b361a98b Fix: bad element 2012-09-15 09:07:06 +02:00
Laurent Destailleur
fd0cd7257c Merge branch '3.2' of git@github.com:Dolibarr/dolibarr.git into 3.2 2012-09-11 01:17:05 +02:00
Laurent Destailleur
b36b56b7a1 Add PHPUnit test to validate calcul_price function for spain. 2012-09-11 01:00:40 +02:00
Laurent Destailleur
4a111234a0 Fix: removed warning 2012-09-10 15:43:58 +02:00
Laurent Destailleur
e2d71b3215 Doc 2012-09-10 10:24:56 +02:00
simnandez
0fbd626822 Fix: use $ldap instead $this 2012-09-10 09:52:44 +02:00
Laurent Destailleur
a79d440a9b Fix: Var not used 2012-09-10 09:52:35 +02:00
Laurent Destailleur
78deb405b2 Fix: Use bad param name 2012-09-09 15:28:43 +02:00
Laurent Destailleur
5046c20b81 Fix: Bad name of var 2012-09-09 15:11:02 +02:00
Regis Houssin
8b28893fbe Fix: GET and POST treatment in dol_loginfunction() 2012-09-08 15:17:24 +02:00
Regis Houssin
c4f3e872ca Fix: GETPOST is already in method 2012-09-08 13:26:25 +02:00
Laurent Destailleur
f0cfbb8b0d Sec: XSS hole
Conflicts:
	htdocs/core/tpl/login.tpl.php
2012-09-08 13:22:02 +02:00
Regis Houssin
0511ba87f4 Fix: [ bug #533 ] 2012-09-06 15:15:47 +02:00
Regis Houssin
04d5a41e9c Fix: [ bug #533 ] Using quotes in intervention sheet description leads
to empty description
2012-09-06 12:53:29 +02:00
Regis Houssin
62c3f04392 Fix: broken feature, enable source details by default 2012-09-06 12:39:27 +02:00
Regis Houssin
feaf5266e9 New: add possibility to force entity in login page 2012-09-05 19:23:46 +02:00
Laurent Destailleur
2b75c81af9 Merge pull request #368 from simnandez/3.2
Fix: Localtaxes unit prices precision
2012-09-05 01:36:12 -07:00
Laurent Destailleur
d3986b4936 Fix: PHP 5.2 compatibility
Conflicts:
	htdocs/filefunc.inc.php
2012-09-05 10:16:23 +02:00
simnandez
9c08abb52c Fix: Localtaxes unit prices precision 2012-09-05 09:51:44 +02:00
Laurent Destailleur
185c03eea5 Fix: We must use shipping address and not the invoice address 2012-09-04 23:10:10 +02:00
Regis Houssin
9614881bed Fix: for use with command line 2012-09-04 12:30:38 +02:00
Regis Houssin
dbb62f010d Fix: add distinct for avoid double record 2012-09-04 11:53:00 +02:00
Regis Houssin
8de657a215 Fix: comaptibility with multicompany and transverse mode 2012-09-04 11:11:48 +02:00
Regis Houssin
e20b0b2e7b Fix: missing upgrade with minor version 2012-09-03 16:27:16 +02:00
Laurent Destailleur
21ad42afab Fix: Parameters at wrong place. 2012-09-03 10:19:21 +02:00
Laurent Destailleur
99b33a70a3 For 3.2.2 2012-09-02 15:28:53 +02:00
Laurent Destailleur
dfda863b7e Update files for 3.2.2 2012-09-02 15:21:43 +02:00
Laurent Destailleur
37f866c31f Update changelog 2012-09-02 15:17:59 +02:00
Laurent Destailleur
7a3f6b9acc Fix: error report when duplicate product 2012-09-02 15:10:37 +02:00
Laurent Destailleur
de7b060e12 Works on larger screens 2012-09-02 14:44:28 +02:00
Laurent Destailleur
f25802520a Fix: Avoid repeat of img 2012-09-02 14:33:22 +02:00
Laurent Destailleur
a7d6289d4b Fix: edit of percentage
Conflicts:
	htdocs/comm/action/fiche.php
2012-09-02 14:27:00 +02:00
Regis Houssin
d12700aeab Fix: for compatibility and avoid error if external module use
$conf->module_parts
2012-09-02 12:28:36 +02:00
Regis Houssin
77688cf988 Fix: comptibility between bureau2crea theme and multicompany module 2012-09-02 11:52:10 +02:00
Regis Houssin
b66aeabb88 Fix: broken features and uniformize code 2012-09-02 09:25:40 +02:00
Regis Houssin
49ae52c708 Merge pull request #366 from simnandez/3.2
Fix: Modify spanish VAT to new rates
2012-09-01 09:31:18 -07:00
simnandez
9fbd6f0b58 Fix: Modify spanish VAT to new rates 2012-09-01 18:25:46 +02:00
simnandez
433ca88c43 Merge branch '3.2' of git://github.com/Dolibarr/dolibarr.git into 3.2 2012-09-01 18:24:11 +02:00
Regis Houssin
aa65ebe136 Fix: this field is for 3.3 2012-09-01 18:07:50 +02:00
Regis Houssin
43a8b9176f Fix: missing query 2012-09-01 17:55:50 +02:00
simnandez
6e12d84f14 Fix: Modify spanish VAT to new rates 2012-09-01 16:39:47 +02:00
Laurent Destailleur
1eac98dc43 Merge branch '3.2' of https://github.com/Dolibarr/dolibarr.git into 3.2 2012-08-31 12:47:24 +02:00
Laurent Destailleur
6691bef701 Fix: Start and end date not saved at project creation 2012-08-31 12:44:55 +02:00
Regis Houssin
24cc745ae8 Fix: update virtualmin script 2012-08-31 11:52:33 +02:00
Laurent Destailleur
7a42514833 Fix: bug for default vat definition 2012-08-30 21:14:30 +02:00
Laurent Destailleur
749f371d4e Merge pull request #360 from GPCsolutions/3.2-lang
FIXED: Spelling mistakes in the french translation of product/admin/prod...
2012-08-30 10:41:30 -07:00
Laurent Destailleur
bee6b92a7b Fix: Bad test 2012-08-30 16:55:59 +02:00
Laurent Destailleur
36ff4abe3c Fix: enhance cleaning of database 2012-08-30 16:52:20 +02:00
Cédric Salvador
6012dff11e FIXED: Spelling mistakes in the french translation of product/admin/product_extrafields.php 2012-08-29 18:58:27 +02:00
Laurent Destailleur
5f197cb1bb Fix: Packaging for 3.2.1 of zip 2012-08-29 12:39:40 +02:00
Laurent Destailleur
6c62b64b7c Fix: Test on ref and ref_ext into webservice 2012-08-29 10:21:25 +02:00
Laurent Destailleur
d4ac506d66 Missing translation key 2012-08-28 22:33:40 +02:00
Laurent Destailleur
e5c2d07c53 Merge branch '3.2' of https://github.com/Dolibarr/dolibarr.git into 3.2 2012-08-28 18:42:39 +02:00
Laurent Destailleur
05de9c19c3 Fix: permission for a user to view its own card using webservice 2012-08-28 18:39:34 +02:00
Regis Houssin
5c2ce8a301 Merge pull request #354 from marcosgdf/missing-licensing
Added me to the COPYRIGHT file
2012-08-27 22:55:51 -07:00
Marcos García
849dc8c836 Added me to the COPYRIGHT file 2012-08-28 07:08:10 +02:00
Laurent Destailleur
bdc330ad6a Merge pull request #351 from simnandez/3.2
Fix: Bad assignation of const for pdf delivery module name
2012-08-27 03:36:03 -07:00
simnandez
85eedfa6e7 Fix: Bad assignation of const for pdf delivery module name 2012-08-27 08:52:10 +02:00
Laurent Destailleur
e121ab8c86 [ bug #512 ] Filter system not working in banks > account > transactions
Conflicts:
	htdocs/compta/bank/account.php
2012-08-26 19:33:32 +02:00
Laurent Destailleur
fe76902342 Fix: Bad field 2012-08-26 13:15:51 +02:00
Laurent Destailleur
9142e3400b Fix: [ bug #254 ] Database backup not working with complex passwords 2012-08-26 00:52:10 +02:00
Regis Houssin
87cc60d647 Revert "Fix: remove obsolete code"
This reverts commit c5728843a5.
2012-08-25 10:59:58 +02:00
Regis Houssin
c5728843a5 Fix: remove obsolete code
Conflicts:
	htdocs/admin/expedition.php
2012-08-25 10:59:41 +02:00
Regis Houssin
e260997e0b Merge pull request #345 from simnandez/3.2
Fix: Bad assignation of const for pdf delivery module name
2012-08-25 01:32:39 -07:00
simnandez
fef04f6921 Fix: Bad assignation of const for pdf delivery module name 2012-08-24 18:03:03 +02:00
simnandez
bc2411098c Fix: Bad assignation of const for pdf delivery module name 2012-08-24 17:45:44 +02:00
simnandez
0dafeb8e44 Fix: Bad assignation of const for pdf delivery module name 2012-08-24 17:30:22 +02:00
simnandez
084efd03a3 Fix: Bad assignation of const for pdf delivery module name 2012-08-24 17:26:36 +02:00
Regis Houssin
61372f4650 Fix: rename for security raison 2012-08-23 18:14:02 +02:00
Regis Houssin
049e588341 Fix: move barcode type entries in module descriptor for best
compatibility with multicompany
2012-08-22 17:46:11 +02:00
Regis Houssin
2d15b64f24 Fix: wrong ereg 2012-08-21 11:46:50 +02:00
Laurent Destailleur
6bab2e0bd8 Fix: The backto use bad url. 2012-08-20 14:17:29 +02:00
Regis Houssin
f425762e9d Fix: missing show field if "in progress" is chosen first 2012-08-20 08:21:05 +02:00
Regis Houssin
81970b8dd0 Fix: avoid warning "is not a legal ECMA-262 octal constant" 2012-08-20 08:12:51 +02:00
Regis Houssin
6e3404a231 Merge pull request #333 from marcosgdf/changelog
Added missing changelog entry
2012-08-19 22:48:27 -07:00
Marcos García
2b0e420618 Added missing changelog entry 2012-08-20 02:50:34 +02:00
Laurent Destailleur
cb96735f50 Fix: [ bug #506 ] Can't set percentage of a started event 2012-08-20 02:16:53 +02:00
Laurent Destailleur
fb2fd71ff4 Merge branch '3.2' of https://github.com/Dolibarr/dolibarr.git into 3.2 2012-08-20 02:16:26 +02:00
Regis Houssin
6c2d9baeb5 Fix: remove old accountancy code, can cause blank screen 2012-08-20 00:34:06 +02:00
Laurent Destailleur
cef55097ea Fix: Default value was not defined 2012-08-20 00:29:13 +02:00
Marcos García
552c82a032 Fixed bug #504
https://doliforge.org/tracker/?func=detail&aid=504&atid=246&group_id=144
2012-08-19 07:51:51 +02:00
Regis Houssin
2355f83295 Merge pull request #326 from marcosgdf/changelog
Added missing changelog entries
2012-08-18 09:56:26 -07:00
Marcos García
b2fa4b3f49 Added missing changelog entries 2012-08-18 18:05:53 +02:00
Regis Houssin
d6f1f870a2 Fix: bad rights 2012-08-18 10:51:13 +02:00
Regis Houssin
2e38300ec4 Fix: [ bug #501 ] Error while trying to modify an user 2012-08-18 10:16:25 +02:00
Regis Houssin
5f8530d0c0 Fix: [ bug #503 ] Unable to delete linked file to a deposit
Conflicts:
	htdocs/compta/paiement/cheque/fiche.php
2012-08-18 09:01:17 +02:00
Marcos García
2bd7dc68d3 Project::setClose wasn't setting the new status 2012-08-18 07:35:55 +02:00
Marcos García
173ff4f92a Fixed a bug where files were not being uploaded to a project's task
Reported by Jose Antonio Garcia in dolibarr.es' forum
http://www.dolibarr.es/index.php/foro/7-bugs-versiones-estables/1250-error-subir-archivo-en-una-tarea-de-un-proyecto

Conflicts:
	htdocs/projet/tasks/document.php
2012-08-18 07:35:39 +02:00
Marcos García
1f9e0d3e00 Translated message was generating an incomplete string 2012-08-17 20:19:10 +02:00
Laurent Destailleur
594d5ee216 Merge pull request #311 from marcosgdf/changelog
Missing changelog entry
2012-08-15 13:00:28 -07:00
Marcos García
2130b9715c Missing changelog entry 2012-08-15 15:58:36 +02:00
Regis Houssin
b2ff7b5ea1 Fix: limit to products and services 2012-08-15 10:35:15 +02:00
Marcos García
f03e0965e2 Forgot to rename the variable 2012-08-15 07:32:10 +02:00
Marcos García
acb9380f1c Fixed a problem with supplier's orders stats
They were showing orders even if they were not approved or ordered

Conflicts:
	htdocs/commande/class/commandestats.class.php
2012-08-15 07:31:55 +02:00
Marcos García
40660482d4 Fixed more average amount graph stats. They include:
* Customer's orders
* Supplier's orders
* Customer's invoices
* Trips and expense

Conflicts:
	htdocs/commande/stats/index.php
2012-08-15 07:30:28 +02:00
Regis Houssin
f1cbb10edc Fix: wrong user count 2012-08-14 19:52:51 +02:00
Marcos García
640f001bba Propal stats weren't showing average total for more than 1 year
Conflicts:
	htdocs/comm/propal/stats/index.php
	htdocs/core/class/stats.class.php
2012-08-14 16:30:16 +02:00
Regis Houssin
7b671815e0 Merge pull request #305 from marcosgdf/missing-changelog-entry
Missing changelog entry
2012-08-14 02:22:19 -07:00
Marcos García
cb1e1be0d3 Missing changelog entry 2012-08-14 11:06:16 +02:00
Marcos García
78a26d61ad Fixed bug #485
Merged patch from J. Fernando Lagrange (lowmemory)
https://doliforge.org/tracker/?func=detail&aid=485&atid=246&group_id=144
2012-08-14 10:23:38 +02:00
Laurent Destailleur
ff2dc246eb Update pad files 2012-08-11 13:02:44 +02:00
Laurent Destailleur
7e0b500d75 Update doc 2012-08-11 03:57:55 +02:00
Laurent Destailleur
3670cfd966 Fix: Broken feautres after migration from old versions 2012-08-10 19:16:53 +02:00
Laurent Destailleur
d090788caa Fix: Do not run request if param is empty 2012-08-08 14:08:37 +02:00
Laurent Destailleur
db4240afad Fix: Do not overwrite global $user information 2012-08-08 09:23:57 +02:00
Raphaël Doursenaud
34673e220d Fix: Display correct user in project tasks' time spent list
Use a local object rather than modifying the global $user object (sic!)
2012-08-08 09:21:29 +02:00
Laurent Destailleur
7f7fa693f3 Merge branch '3.2' of git@github.com:Dolibarr/dolibarr.git into 3.2 2012-08-08 04:09:25 +02:00
Laurent Destailleur
4786ab9268 Fix: Specimen generation fails 2012-08-08 04:06:19 +02:00
Laurent Destailleur
0db0ab34b4 [ bug #480 ] Can't receive to stock with strict mode 2012-08-07 19:36:34 +02:00
Laurent Destailleur
69b65de41b Fix: Missing desc field 2012-08-07 19:11:26 +02:00
Laurent Destailleur
0f2a1a854b Fix: autoselect when it should not 2012-08-07 18:59:07 +02:00
Laurent Destailleur
32a7747440 Fix: Delete all files (PROV* when validating. 2012-08-07 16:05:00 +02:00
Regis Houssin
0a8ae2934d Fix: remove unused file and missing print 2012-08-06 20:41:17 +02:00
Regis Houssin
afeabd44f0 Fix: update jquery fileupload 2012-08-06 19:06:11 +02:00
Regis Houssin
99e234d703 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-08-06 17:41:06 +02:00
Regis Houssin
117cd337dd Fix: missing object 2012-08-06 17:39:56 +02:00
Regis Houssin
4f5432160d Fix: remove draft status if invoice is validated 2012-08-06 09:14:44 +02:00
Laurent Destailleur
92624d650f Fix into categorie functions 2012-08-05 23:59:13 +02:00
Laurent Destailleur
8b2f1eee13 Fix: W3C 2012-08-05 22:01:26 +02:00
Regis Houssin
96726c1c9b Fix: function setEventMessage() not in 3.2 2012-08-05 21:18:36 +02:00
Regis Houssin
bbe270d4bf Fix: missing delete shipping and delivery files
(minimum for possibility to merge with 3.2)

Conflicts:
	htdocs/core/modules/livraison/modules_livraison.php
	htdocs/livraison/class/livraison.class.php
2012-08-05 20:42:06 +02:00
Regis Houssin
bb74a63d59 Fix: delete pdf if supplier invoice is deleted
Fix: compatibility with external modules
(minimum for 3.2)
2012-08-05 18:37:48 +02:00
Regis Houssin
b1f3dbd45e Fix: indentation 2012-08-05 18:37:34 +02:00
Regis Houssin
da8bc79c6d Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-08-05 18:37:17 +02:00
Regis Houssin
54134e3d19 Fix: compatibility with jquery fileupload 2012-08-05 18:36:59 +02:00
Laurent Destailleur
fa4c69c52f Merge branch '3.2' of git@github.com:Dolibarr/dolibarr.git into 3.2 2012-08-05 14:55:21 +02:00
Laurent Destailleur
e1f57b60e3 Qual: Removed bad herit 2012-08-05 14:46:24 +02:00
Regis Houssin
da29ea89a7 Fix: avoid warning with php 5.4 2012-08-05 14:34:37 +02:00
Laurent Destailleur
fe672e1e4b Merge branch '3.2' of git@github.com:Dolibarr/dolibarr.git into 3.2 2012-08-05 00:46:39 +02:00
Laurent Destailleur
be4960cfbb Fix: exit code when upgrade is ran from command line 2012-08-05 00:46:10 +02:00
Regis Houssin
e4f7df25b0 Fix: remove unused code for avoid warning with IE9 2012-08-04 13:52:02 +02:00
Laurent Destailleur
17c45208d3 Fix: Prepare 3.2.1 version 2012-08-03 23:57:17 +02:00
Laurent Destailleur
6a4f03eab3 Prepare 3.2.1 2012-08-03 19:27:50 +02:00
Laurent Destailleur
3778d206ac Fix: project validation 2012-08-03 19:05:49 +02:00
Laurent Destailleur
f4c9da5e9f Fix: Bad object 2012-08-03 18:53:31 +02:00
Laurent Destailleur
a2641b89e7 Fix: Bad fix 2012-08-03 18:43:30 +02:00
Laurent Destailleur
983c38a33d Fix: tr_TR 2012-08-03 17:10:59 +02:00
Regis Houssin
899f4df9ed Fix: [bug #478] Can access pages belonging to disabled modules 2012-08-03 11:58:33 +02:00
Regis Houssin
ae0a746510 Fix: bad document path with multicompany 2012-08-01 19:35:55 +02:00
Regis Houssin
f6afc75d96 Fix: avoid errors if install directory is deleted before module
activation
2012-08-01 14:43:28 +02:00
Regis Houssin
a2db2c5012 Fix: regression (multicompany) 2012-08-01 13:04:32 +02:00
Laurent Destailleur
ae6e3ad5c4 [ bug #464 ] Payment form should allow to add transmitter for bank transfers 2012-07-31 13:44:58 +02:00
Laurent Destailleur
e15834dae2 Fix: Removing chekstyle warning helps me to find real bugs 2012-07-29 15:27:37 +02:00
Laurent Destailleur
8a77ffe58f Fix: Removing chekstyle warning helps me to find real bugs 2012-07-29 15:08:03 +02:00
Marcos García
498ac04ad1 Typo in es_ES translation 2012-07-28 18:39:27 +02:00
Regis Houssin
c77ecc15c9 Fix: reorder include 2012-07-28 09:59:30 +02:00
Regis Houssin
2a1c6422ac Merge pull request #263 from marcosgdf/minor
Duplicated code
2012-07-28 00:32:08 -07:00
Marcos García
4ff5f1bf1c Duplicated code 2012-07-27 23:50:36 +02:00
Regis Houssin
a37035c862 Fix: uniformize code 2012-07-27 14:14:26 +02:00
Regis Houssin
cbb5ca229a Merge pull request #259 from FHenry/3.2
Correct bug 472
2012-07-27 05:12:16 -07:00
Raphaël Doursenaud
954f46ec62 Fix: Allows to use a comma decimal separator in supplier invoices
payments
2012-07-27 13:55:25 +02:00
FHenry
9798ddad80 Correct bug 472 2012-07-27 10:41:26 +02:00
Regis Houssin
c92bd58278 Fix: changelog 2012-07-26 21:07:37 +02:00
Regis Houssin
c429c421da Fix: Bug #460 - Wrong entity assignment when creating a warehouse 2012-07-26 20:50:24 +02:00
Regis Houssin
51ccb33964 Fix: carriage return 2012-07-26 18:12:02 +02:00
Regis Houssin
c55eabeaff Fix: external user confidentiality 2012-07-26 18:11:50 +02:00
Regis Houssin
a92bb8373a Fix: bad path 2012-07-26 17:04:50 +02:00
Regis Houssin
46304c8d98 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-07-26 14:37:21 +02:00
Regis Houssin
5c93da8a72 Fix: problem with double quote 2012-07-26 14:37:10 +02:00
Laurent Destailleur
087644a861 Update translation for tr_TR
Conflicts:
	htdocs/langs/tr_TR/admin.lang
	htdocs/langs/tr_TR/agenda.lang
	htdocs/langs/tr_TR/bills.lang
	htdocs/langs/tr_TR/bookmarks.lang
	htdocs/langs/tr_TR/boxes.lang
	htdocs/langs/tr_TR/cashdesk.lang
	htdocs/langs/tr_TR/categories.lang
	htdocs/langs/tr_TR/commercial.lang
	htdocs/langs/tr_TR/companies.lang
	htdocs/langs/tr_TR/compta.lang
	htdocs/langs/tr_TR/dict.lang
	htdocs/langs/tr_TR/install.lang
	htdocs/langs/tr_TR/main.lang
	htdocs/langs/tr_TR/propal.lang
	htdocs/langs/tr_TR/sendings.lang
2012-07-25 17:59:35 +02:00
Regis Houssin
1b5f540d93 Fix: can't read permissions with an external module in root directory
instead "custom" directory
2012-07-25 13:32:25 +02:00
Regis Houssin
a0f78aad4a Fix: for compatibility 2012-07-25 12:57:59 +02:00
Laurent Destailleur
70cf8227a2 Fix: Products with no prices not visible
Conflicts:
	htdocs/core/class/html.form.class.php
2012-07-25 12:47:50 +02:00
Regis Houssin
67fd6356aa Merge pull request #257 from FHenry/3.2
Correction mail unsubcribe translation
2012-07-24 09:15:04 -07:00
FHenry
58e61781e1 Remove useless paramater 2012-07-24 17:31:30 +02:00
FHenry
8a2e5b5962 Fix style 2012-07-24 14:34:23 +02:00
FHenry
1891e7364a Fix nb mass mailling receive according other status than read 2012-07-24 14:32:03 +02:00
FHenry
ba9861f856 Add __MAILTOEMAIL__ to mailing-send.php 2012-07-24 10:15:58 +02:00
FHenry
bc9d85b03f Unsubscribe tag spelling correction 2012-07-24 09:28:16 +02:00
FHenry
3e2e3b2bcb Correction mail unsubcribe translation 2012-07-23 18:58:40 +02:00
Laurent Destailleur
ab71e4f891 Better fix 2012-07-23 11:02:53 +02:00
Regis Houssin
a4ec4224b0 Fix: bug #467 2012-07-23 10:31:58 +02:00
Laurent Destailleur
0b77cb3a5d Fix: Translation missing 2012-07-22 23:07:56 +02:00
Laurent Destailleur
b4aa076a82 Fix: escape for create command 2012-07-22 21:53:50 +02:00
Laurent Destailleur
dc532cc2d4 Fix: escape for create command 2012-07-22 21:48:43 +02:00
Laurent Destailleur
3efa77a70f Merge branch '3.2' of git@github.com:Dolibarr/dolibarr.git into 3.2 2012-07-22 17:15:39 +02:00
Laurent Destailleur
a8d32b71bf Merge pull request #254 from marcosgdf/minor-fixes
Minor fixes
2012-07-22 08:15:18 -07:00
Laurent Destailleur
8074022e8f Fix: dol_syslog at wrong place. 2012-07-22 16:58:03 +02:00
Laurent Destailleur
bcde526db1 Fix: sql injection for create database 2012-07-22 16:57:57 +02:00
Laurent Destailleur
23c4f78df0 Merge pull request #255 from marcosgdf/fix-bug-452
Fixed bug #452
2012-07-22 07:32:10 -07:00
Marcos García
148e40e07c Moved bookmark translations from other.lang to bookmarks.lang, also removed unused translations 2012-07-22 16:17:49 +02:00
Laurent Destailleur
1eae596f98 Prepare 3.2.1 2012-07-22 14:33:22 +02:00
Laurent Destailleur
2a9456cb83 Fix: Brazilian translation 2012-07-22 14:23:13 +02:00
Laurent Destailleur
f1f9c842f8 Fix: The missing feature to close proposal on order close was fixed
differently.
2012-07-22 13:13:38 +02:00
Marcos García
7f243d92e5 Removed unnecesary code 2012-07-22 03:30:21 +02:00
Marcos García
10384e3856 Another mini typo 2012-07-22 02:40:49 +02:00
Marcos García
8bc3608717 Allowed MailmanTitle to be translated, also SPIP should be upper-cased 2012-07-22 02:22:01 +02:00
Marcos García
4b62eaeed2 Typos in es_ES and added missing translations 2012-07-22 01:45:46 +02:00
Marcos García
c5e1b367de Merge branch 'fix-spanish-translation-typo' into minor-fixes 2012-07-22 00:43:45 +02:00
Marcos García
06b6c38379 There's no "Código de barra" 2012-07-22 00:39:06 +02:00
Marcos García
ee0f92f6aa Add missing es_ES translations 2012-07-22 00:08:48 +02:00
Marcos García
49d943e57f Removed duplicated code 2012-07-21 23:54:23 +02:00
Marcos García
3d10d6a559 It was showing Products Area instead of Products and Services Area 2012-07-21 01:08:02 +02:00
Marcos García
ccdaf2ffb4 When viewing a product/service, if we don't know the type of the item, then we use a generic page title. Also fixed typo in es_ES 2012-07-21 00:08:43 +02:00
Marcos García
c0c481a746 Translation Typo in es_ES 2012-07-20 22:46:39 +02:00
Marcos García
c2f465a98a Added some missing translations in es_ES and fixed a typo too 2012-07-20 21:45:13 +02:00
Marcos García
f6fc21f5fb Fixed a minor bug with the BackToList link in a budget detail view reported in Dolibarr.es
You'll see a lot of lines changed because of incorrect line endings
2012-07-20 21:25:29 +02:00
Marcos García
c3b18a1e38 Spanish translation typo 2012-07-20 21:19:08 +02:00
Marcos García
11430cd555 Php should be upper-cased. Also removed the string from the lang files as it should not be translated. I even think that in China they call it PHP 2012-07-20 20:38:57 +02:00
Marcos García
fa8fad3b04 SMS should be upper-cased 2012-07-20 20:33:12 +02:00
Marcos García
3ed1795096 Added missing translation 2012-07-20 19:53:43 +02:00
Marcos García
5f0491bc6f There's no disec input... 2012-07-20 19:46:37 +02:00
Marcos García
0ff5a7bc9c Fixed little typo 2012-07-20 18:24:23 +02:00
Regis Houssin
34f790b85e Merge pull request #250 from marcosgdf/fix-some-translations
Fix some typos on translations
2012-07-19 14:36:24 -07:00
Marcos García
af9c8abe9c Fixed Catalan typos too 2012-07-19 20:06:08 +02:00
Marcos García
50129ec945 Contracts box name wasn't being translated 2012-07-19 19:40:56 +02:00
Raphaël Doursenaud
2160e86928 French wording
Réception -> Traitement en cours
2012-07-19 19:34:15 +02:00
Raphaël Doursenaud
0b2e07964f French spelling
Chiffre d'affaire -> Chiffre d'affaires
2012-07-19 19:34:06 +02:00
Regis Houssin
5386f00b0e Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-07-19 19:33:55 +02:00
Raphaël Doursenaud
78b0f14b1a Text: Chiffrer 2012-07-19 19:33:37 +02:00
Regis Houssin
467bf090dd Merge pull request #246 from simnandez/3.2
Trad: Better translation
2012-07-19 10:25:31 -07:00
Regis Houssin
4fcbe39fd9 Merge pull request #248 from marcosgdf/fix-contract-translation
The tab Documents of the Contracts module wasn't being translated
2012-07-19 10:25:02 -07:00
Regis Houssin
7ad2de61d1 Merge pull request #249 from marcosgdf/fix-security-seconds-translation
Replaced "Seconds" for "seconds"
2012-07-19 10:24:15 -07:00
Marcos García
d5c95b76a5 Added missing translation and fixed some typos 2012-07-19 19:06:23 +02:00
Marcos García
e7d117c920 Fixed some spanish & catalan translations 2012-07-19 18:41:36 +02:00
Marcos García
9b21aa0a60 Replaced "Seconds" for "seconds" 2012-07-19 18:05:09 +02:00
Laurent Destailleur
f5a4f32b0f [ bug #445 ] Hex escaping in descriptions 2012-07-19 18:04:56 +02:00
Laurent Destailleur
674aa0cf12 Fix: Duplicate begin 2012-07-19 17:28:13 +02:00
Marcos García
d1646e245a The tab Documents of the Contracts module wasn't being translated 2012-07-19 17:18:41 +02:00
Laurent Destailleur
03f85bef83 [ bug #444 ] Regression on auto-closing for proposals and orders 2012-07-19 16:57:10 +02:00
Laurent Destailleur
d68a2cb0d8 Fix: Removed warning 2012-07-19 16:27:03 +02:00
simnandez
5a1e29cc08 Trad: Better translation 2012-07-19 12:28:47 +02:00
Regis Houssin
45b24fff0d Merge pull request #244 from simnandez/3.2
Trad: Add missing translation
2012-07-18 23:44:12 -07:00
Regis Houssin
29256aba8b Merge pull request #245 from marcosgdf/fix-bug-456
Fixed bug #465
2012-07-18 23:43:19 -07:00
Marcos García
4f2a47c4fc Fixed bug https://doliforge.org/tracker/?func=detail&aid=456&atid=246&group_id=144 2012-07-19 02:26:41 +02:00
Laurent Destailleur
f4f2db33f0 Better translation
Conflicts:
	htdocs/langs/en_US/workflow.lang
	htdocs/langs/fr_FR/workflow.lang
2012-07-17 15:30:52 +02:00
Laurent Destailleur
b73014c044 Merge branch '3.2' of https://github.com/Dolibarr/dolibarr.git into 3.2 2012-07-17 01:27:08 +02:00
Laurent Destailleur
53cc1667d5 Fix: error when validating shipment for non predefined products with a
selected warehouse.
2012-07-17 01:26:31 +02:00
simnandez
af9b03e7c7 Trad: Add missing translation 2012-07-14 22:25:14 +02:00
Regis Houssin
dd7c3ed2f8 Merge pull request #243 from simnandez/3.2
Trad: Add missing translations
2012-07-13 07:28:46 -07:00
Regis Houssin
7e25172f03 Fix: missing entity filter 2012-07-13 16:24:12 +02:00
simnandez
a83c118a8f Trad: Add missing translations 2012-07-13 15:56:55 +02:00
Regis Houssin
fd9574a2f8 Merge pull request #241 from simnandez/3.2
3.2
2012-07-13 06:07:52 -07:00
simnandez
8014713795 Fix: Bad local taxes if price base type is TTC 2012-07-13 15:02:02 +02:00
simnandez
10e632375f Fix: Bad local taxes if price base type is TTC 2012-07-13 14:40:51 +02:00
Laurent Destailleur
9327858bee Fix: Bad merge 2012-07-13 12:23:17 +02:00
Laurent Destailleur
b801a391a4 Fix: Phone not saved when using web service 2012-07-13 12:15:16 +02:00
Regis Houssin
20704d6a5c New: classify billed order if invoice billed (workflow
manager)

Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/langs/en_US/workflow.lang
	htdocs/langs/fr_FR/workflow.lang
2012-07-13 12:14:41 +02:00
Regis Houssin
1af4834f10 Fix: for multicompany transverse mode 2012-07-10 13:43:38 +02:00
Regis Houssin
02f30aeee2 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-10 13:40:17 +02:00
Regis Houssin
2f9f7d401f Merge branch '3.2' of git+ssh://github.com/Dolibarr/dolibarr into 3.2.1 2012-07-08 18:37:43 +02:00
Laurent Destailleur
58b2b91928 Fix: removed warning 2012-07-08 16:55:42 +02:00
Laurent Destailleur
d11e22c970 Merge branch '3.2' of https://github.com/Dolibarr/dolibarr.git into 3.2 2012-07-07 20:22:35 +02:00
Laurent Destailleur
0428d5eee4 Prepare 3.2 release 2012-07-07 20:21:44 +02:00
Regis Houssin
3686fad393 Fix: compatibility with multicompany and transverse mode 2012-07-07 15:25:21 +02:00
Regis Houssin
8b832f475f Fix: getpost error 2012-07-07 12:53:27 +02:00
Regis Houssin
925bded6d9 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-07 12:29:04 +02:00
Regis Houssin
dd60c384a5 Fix: missing object 2012-07-07 12:27:45 +02:00
Regis Houssin
293e0ac831 Change-Id: I5f8bcf59cf2fc0d902edb4d61f8c20a2880765a2 2012-07-07 12:21:40 +02:00
Regis Houssin
250e3555c3 Fix: more bugs with multicompany 2012-07-07 11:03:16 +02:00
Regis Houssin
8ee06f02b1 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-07 11:02:59 +02:00
Regis Houssin
ba896c024d Fix: problem with template 2012-07-07 11:01:48 +02:00
Regis Houssin
41dcd9370a Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-07 08:01:48 +02:00
Regis Houssin
928af1a2b3 Fix: security 2012-07-07 08:00:18 +02:00
Regis Houssin
c8eb666826 Fix: compatibility with multicompany 2012-07-06 20:53:18 +02:00
Regis Houssin
6f919da5d9 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-06 10:24:24 +02:00
Regis Houssin
7382f4e3ee Fix: bad link and uniformize code 2012-07-06 10:23:28 +02:00
Regis Houssin
ff048175f7 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-06 09:54:54 +02:00
Regis Houssin
a3c74aa9bd Fix: price field is obsolete 2012-07-06 09:53:45 +02:00
Regis Houssin
ce7f45ab1f Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-05 15:51:42 +02:00
Regis Houssin
59c84747ac Revert "Fix: wrong link"
This reverts commit 45f09da98a.
2012-07-05 15:49:45 +02:00
Regis Houssin
8befcb9477 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-05 15:41:22 +02:00
Regis Houssin
45f09da98a Fix: wrong link 2012-07-05 15:40:13 +02:00
Regis Houssin
bf9fd6a2da Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-03 21:15:02 +02:00
Regis Houssin
5c2d8656cc Fix: missing images files filter 2012-07-03 21:13:58 +02:00
Regis Houssin
ab6129a1cc Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-03 16:43:42 +02:00
Regis Houssin
a13bf2b93f Fix: test if ckeditor is enable 2012-07-03 16:42:34 +02:00
Regis Houssin
b0ab71db5f Fix: merge problem 2012-07-02 22:47:19 +02:00
Regis Houssin
7f021ad5d9 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-02 22:43:00 +02:00
Regis Houssin
65304f2e77 Fix: missing shipping linked object box 2012-07-02 22:40:48 +02:00
Regis Houssin
8a6cd7f84d New: check the real version and remove specific php settings 2012-07-02 21:00:25 +02:00
Regis Houssin
3e30cde02e Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-02 20:07:44 +02:00
Regis Houssin
ea21064ca2 Fix: access problem if thirdparty module is disable 2012-07-02 20:06:08 +02:00
Regis Houssin
4e395e741c Merge pull request #237 from simnandez/3.2
Trad: Add missing translations
2012-07-02 09:01:18 -07:00
simnandez
b5a12ff088 Trad: Add missing translations 2012-07-02 17:36:41 +02:00
Regis Houssin
92858a7b47 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-02 17:13:39 +02:00
Regis Houssin
9623d50f48 Fix: big problem with linked elements 2012-07-02 17:11:35 +02:00
Regis Houssin
deecfe5d07 Fix: wrong sql request 2012-07-02 16:14:44 +02:00
Regis Houssin
067a9b0820 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git
into 3.2.1

Conflicts:
	htdocs/product/class/product.class.php
2012-07-02 15:49:04 +02:00
Regis Houssin
1f98a23587 Fix: compatibility with multicompany
Conflicts:
	htdocs/product/class/product.class.php
2012-07-02 15:46:31 +02:00
Regis Houssin
cd3df1d6e1 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-02 10:39:40 +02:00
Regis Houssin
1d5db424a1 Fix: missing contract reference 2012-07-02 10:38:40 +02:00
Regis Houssin
b632c2233b Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git
into 3.2.1
2012-07-02 10:17:42 +02:00
Regis Houssin
8d0cafc687 Fix: sql request error 2012-07-02 10:15:03 +02:00
Laurent Destailleur
57958e25bf Prepare 3.2 release 2012-06-30 02:21:59 +02:00
Laurent Destailleur
9edb149d2c Prepare 3.2 final 2012-06-30 01:48:25 +02:00
Laurent Destailleur
622720132d Use stable url 2012-06-30 01:45:54 +02:00
Laurent Destailleur
bdd8b393f9 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-30 01:15:50 +02:00
Regis Houssin
123b45aa4b Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-06-29 10:10:18 +02:00
Regis Houssin
55ac02382b Fix: missing parameters ! 2012-06-29 10:09:15 +02:00
Regis Houssin
87f2ec663d Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-06-29 09:37:46 +02:00
Regis Houssin
70cd7b87e9 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-29 09:36:33 +02:00
Regis Houssin
18ae5ff6ea New: remove linked elements invalid 2012-06-29 09:36:18 +02:00
Laurent Destailleur
52c2d39194 Fix: Can't modifiy accountancy code sell 2012-06-28 19:59:33 +02:00
Laurent Destailleur
0b56923de5 Fix: Panicum module for supplier accountancy code 2012-06-28 19:49:54 +02:00
Regis Houssin
11f78c1913 Fix: add ckeditor create div option with dolibarr_mailings toolbar 2012-06-27 16:39:39 +02:00
Regis Houssin
3164b5615c Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-06-27 16:37:47 +02:00
jfefe
189cba6c41 Fix : use lastname to test contact ldap synchro (not name) 2012-06-27 13:29:45 +02:00
Laurent Destailleur
de5612ae0b Fix: Missing include 2012-06-27 13:28:51 +02:00
Laurent Destailleur
f23d826e0a Fix: Bad hour 2012-06-27 01:41:44 +02:00
Laurent Destailleur
62f14e3dd5 Fix: Removed warning. Fix compatibility. 2012-06-26 23:13:03 +02:00
Laurent Destailleur
643e077c68 Fix: turkish language 2012-06-24 20:01:34 +02:00
Laurent Destailleur
5e490f8530 Fix: Remove warning 2012-06-24 19:43:26 +02:00
Laurent Destailleur
a67f6cc732 Fix: Preview of shiping receipts 2012-06-23 21:00:43 +02:00
Laurent Destailleur
06c17b806e Fix: fckeditor ko on linux package 2012-06-23 20:17:31 +02:00
Laurent Destailleur
8deeac403a Fix: Label was not translated 2012-06-23 15:03:02 +02:00
Regis Houssin
56f7d31d11 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-06-21 09:03:14 +02:00
Laurent Destailleur
ed724b82d3 Fix: We must not define language var if parm not defined.
Conflicts:
	htdocs/master.inc.php
2012-06-20 23:38:31 +02:00
Regis Houssin
d941d1efee Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git
into 3.2.1

Conflicts:
	build/makepack-dolibarr.pl
	htdocs/filefunc.inc.php
	htdocs/install/inc.php
2012-06-20 22:29:28 +02:00
Regis Houssin
9fed7fba30 Fix: missing not empty test 2012-06-20 22:24:26 +02:00
Laurent Destailleur
cb04444301 Fix: If option to not manage a login is on, login is not output into
info message.
Fix: Bad error management
2012-06-19 21:55:28 +02:00
Laurent Destailleur
8c030f4f81 Fix: rebuild_merge_pdf does not regenerate files already existing by
default.
2012-06-19 21:34:55 +02:00
Regis Houssin
4ef651d50b Merge pull request #231 from simnandez/3.2
3.2
2012-06-18 01:30:10 -07:00
simnandez
6bd438fc7f Doc: Update ChangeLog 2012-06-18 10:24:52 +02:00
Laurent Destailleur
657c7eb4cf Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into
3.2

Conflicts:
	build/exe/doliwamp/doliwamp.iss
	build/makepack-howto.txt
2012-06-17 22:35:47 +02:00
Laurent Destailleur
a00439b375 Prepare release 2012-06-17 22:30:01 +02:00
Laurent Destailleur
cb6f9f40b8 Prepare release 2012-06-17 19:22:44 +02:00
Laurent Destailleur
cfa8ca5c52 Fix: Removed warning 2012-06-17 17:45:25 +02:00
Laurent Destailleur
3354b35e75 Fix: Avoid warning if param is empty 2012-06-17 17:34:21 +02:00
Regis Houssin
9b1047eea7 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git
into 3.2.1
2012-06-16 08:26:26 +02:00
Laurent Destailleur
3556adc11d Fix: Permissions for click2dial tab 2012-06-16 00:10:47 +02:00
Regis Houssin
0d83691c5b Merge pull request #229 from simnandez/3.2
Fix: [ bug #427 ] Bad links to wiki help in certains menus
2012-06-15 06:57:54 -07:00
simnandez
bcfd35648b Fix: [ bug #427 ] Bad links to wiki help in certains menus 2012-06-15 15:54:56 +02:00
Laurent Destailleur
554a5b4c29 Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2 2012-06-15 12:44:31 +02:00
Laurent Destailleur
eb543f0606 Fix: missing a return into clean_url function 2012-06-15 12:44:11 +02:00
Regis Houssin
1f4d3207fe Merge pull request #227 from simnandez/3.2
Fix: [ bug #427 ] Bad links to wiki help in certains menus
2012-06-15 03:28:20 -07:00
simnandez
83d75aaa31 Fix: [ bug #427 ] Bad links to wiki help in certains menus 2012-06-15 12:20:45 +02:00
Laurent Destailleur
2e74a4ba85 Fix: The fix made by renaming PDF_ADDALSOTARGETDETAILS into MAIN_PDF_ADDALSOSOURCEDETAILS was fixing things in the wrong direction. The regression was the missing data on the recipient compared to 3.1.1 2012-06-15 11:26:16 +02:00
Laurent Destailleur
5d502aa7d1 Fix: function dol_nboflines_bis 2012-06-15 00:17:12 +02:00
Laurent Destailleur
c28c5c1003 Fix: Bad calculation of nb of line. Fix: Bad position of lines into pdf_soleil 2012-06-14 20:01:47 +02:00
Laurent Destailleur
383195581f Fix: Messy source address 2012-06-14 17:51:56 +02:00
Laurent Destailleur
6c27963d1d Fix: Use order date for stats, not valid date. 2012-06-14 16:34:34 +02:00
Regis Houssin
707bffd181 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-06-13 21:54:27 +02:00
Laurent Destailleur
6406d4e64c Fix: typo error 2012-06-13 20:16:21 +02:00
Laurent Destailleur
142e7e55d7 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-13 20:14:48 +02:00
Regis Houssin
56188ca798 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-12 23:15:25 +02:00
Regis Houssin
c8c31b2167 Fix: mutualize ckeditor parameters 2012-06-12 23:14:54 +02:00
Regis Houssin
c4fbdbbce4 Fix: mutualize ckeditor parameters 2012-06-12 23:13:59 +02:00
Regis Houssin
86aab20c0a Merge pull request #224 from simnandez/3.2
Fix: Missing translation key
2012-06-11 13:02:22 -07:00
Regis Houssin
548266d607 Fix: uniformize code 2012-06-11 21:46:37 +02:00
Regis Houssin
fb15ea20c6 Fix: update jquery-cookie plugin 2012-06-11 17:27:20 +02:00
Regis Houssin
c9be1cbb8b Fix: missing remove_file action
Fix: use object instead id and store odt filename in object for use in
triggers
2012-06-10 17:09:44 +02:00
Regis Houssin
eef50058b1 Fix: bad parameters, use global 2012-06-10 10:30:45 +02:00
Regis Houssin
c9c4ba2a72 Fix: problem with external modules and uniformize code
Conflicts:
	htdocs/comm/propal/document.php
	htdocs/core/class/fileupload.class.php
	htdocs/projet/fiche.php

Change-Id: Ib36cd4d6ad5eb1e9ad2a188ef276f37c098cfef4
2012-06-09 18:47:16 +02:00
Laurent Destailleur
4c52e477e4 Fix: Removed non greek sentences 2012-06-09 12:41:03 +02:00
Laurent Destailleur
b8b400a5a4 Fix: No alpha here, this breaks ability to submit html content with
images or links.
2012-06-09 12:40:51 +02:00
simnandez
92cb694f55 Fix: Missing translation key 2012-06-09 09:05:14 +02:00
Regis Houssin
db148c4233 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-06-09 07:51:38 +02:00
Laurent Destailleur
2be18e834a Fix: Turkish translation 2012-06-09 00:25:31 +02:00
Laurent Destailleur
b554dfc3d2 Fix: Missing translation key 2012-06-09 00:25:22 +02:00
Laurent Destailleur
183ba3e8ca Fix: Another fix for var not initialized 2012-06-08 22:26:54 +02:00
Laurent Destailleur
f2365a4c8d Fix: A lot of pb into javascript. Javascripts code for same feature was
not inserted always at same place (sometinmes at low level, and
sometimes at high level). This was creating conflict into javascript.

Conflicts:
	htdocs/product/class/product.class.php
2012-06-08 22:25:45 +02:00
Regis Houssin
c512585670 Fix: delete or rename a document product dir 2012-06-08 21:41:37 +02:00
Regis Houssin
1b19fddbc6 Fix: missing oldcopy during update 2012-06-08 21:41:21 +02:00
Regis Houssin
1c3bf3bb22 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-06-08 18:21:22 +02:00
Regis Houssin
db840bf8de Fix: remove deprecated code can cause warning 2012-06-08 18:20:06 +02:00
Regis Houssin
4713738ea3 Fix: avoid warning 2012-06-08 18:19:55 +02:00
Regis Houssin
176c6013ec Fix: bad option name 2012-06-08 11:48:07 +02:00
Regis Houssin
6f28b69804 Fix: add iframe transport for compatibility with all browser 2012-06-08 11:36:46 +02:00
Regis Houssin
92bb9c99f5 Release 3.2.1-alpha 2012-06-08 07:43:42 +02:00
Regis Houssin
aee1c3b069 Fix: more clean code for new version of jQuery fileupload 2012-06-08 07:25:55 +02:00
Regis Houssin
1f4be4cfed Fix: stock message in session and reload the page for avoid url problem
with jQuery fileupload
2012-06-08 07:25:43 +02:00
Regis Houssin
a04ca9449a New: update jQuery and jQuery UI 2012-06-08 07:25:31 +02:00
Regis Houssin
1649a9a1b1 Fix: reload page after file upload completed 2012-06-08 07:25:20 +02:00
Regis Houssin
8c4ddb99be Fix: add max file size 2012-06-08 07:25:07 +02:00
Regis Houssin
bef5b66dab Fix: replace Bootstrap version by jQueryUI version 2012-06-08 07:24:52 +02:00
Regis Houssin
c43b5f99ac Works on jQuery fileupload upgrade (Todo: css problem) 2012-06-08 07:24:22 +02:00
Laurent Destailleur
d8894b149e Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-06 23:13:41 +02:00
Laurent Destailleur
407978991c Fix: bad error management 2012-06-06 23:05:59 +02:00
Regis Houssin
0d1159d862 Fix: problem with external module 2012-06-06 23:02:46 +02:00
Laurent Destailleur
06442f4755 Fix: Var not initialized 2012-06-06 21:39:37 +02:00
Regis Houssin
54dd02413f Fix: missing search in alternative root directory 2012-06-06 14:05:04 +02:00
Laurent Destailleur
7feff22c1a Fxi: Bad permission check 2012-06-06 00:23:13 +02:00
Laurent Destailleur
a5a4ef538d Fix: Exclude temp file 2012-06-06 00:23:00 +02:00
Laurent Destailleur
c8bd77ddd7 Fix: Missing permission check 2012-06-06 00:22:43 +02:00
Laurent Destailleur
1c32b4231d Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-05 12:55:12 +02:00
Laurent Destailleur
31560e19df Fix with PHP 5.2 2012-06-05 12:54:34 +02:00
Regis Houssin
e9a8ec1795 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-04 11:26:01 +02:00
Regis Houssin
26aa12de97 Fix: don't exclude savant and jstree for externals modules ! 2012-06-04 11:25:17 +02:00
Laurent Destailleur
00d185f648 Fix: Use wrong handler. Make install fails. 2012-06-04 02:15:10 +02:00
Regis Houssin
4e05640ecb Fix: date format error 2012-06-03 23:56:27 +02:00
Regis Houssin
ff33cb4a88 Fix: merge array of hookmanager errors 2012-06-03 23:55:05 +02:00
Laurent Destailleur
5ce0fe1405 Fix: Solve error Method Not Implemented 2012-06-01 21:24:54 +02:00
Laurent Destailleur
7c61f6fd88 Fix: Try a fix for the _FILES escape problem. 2012-06-01 21:00:03 +02:00
Laurent Destailleur
42b3e109d7 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-01 20:58:00 +02:00
Regis Houssin
d11971dbbd Merge pull request #217 from GPCsolutions/3.2
Fixed a bug in intervention's list navigation
2012-06-01 02:19:29 -07:00
Raphaël Doursenaud
20d90831e1 Fixed a bug in interventions' list navigation
The navigation arrows were referencing "index.php" file thus
preventing navigation between pages.
The actual name of the file is "list.php".
2012-06-01 10:52:39 +02:00
Laurent Destailleur
0160fb8c5e Fix: an url must be with url escape format. 2012-06-01 10:12:15 +02:00
Laurent Destailleur
a51114d571 Fix: regression. quote was no more supported. 2012-06-01 09:34:43 +02:00
Laurent Destailleur
52f270d623 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-01 09:28:49 +02:00
Regis Houssin
9c42cdc7d3 Fix: clear file name send by php 2012-06-01 07:14:29 +02:00
Raphaël Doursenaud
d79b65ce49 Fixed a bug preventing invoice sorting by authors 2012-06-01 06:52:59 +02:00
Laurent Destailleur
2b85a2fcd4 Merge pull request #216 from GPCsolutions/82af0ed28f223d1324c8843abb106c8ee6af9a4b
Fixed a bug preventing invoice sorting by authors
2012-05-31 17:57:40 -07:00
Laurent Destailleur
4fd98dfb72 Fix: Revert a lot of commits made on wrong branch. No new features, no
change on architecture on a beta, only bug fixes on visible features.
2012-06-01 02:22:39 +02:00
Laurent Destailleur
06eca56e00 Revert "Fix: replace Bootstrap version by jQueryUI version"
This reverts commit 03ec0d7cc5.
2012-06-01 02:07:35 +02:00
Laurent Destailleur
2d818fc886 Revert "Fix: add max file size"
This reverts commit 8b224e9e2d.
2012-06-01 02:07:24 +02:00
Laurent Destailleur
180908bfe1 Revert "Fix: reload page after file upload completed"
This reverts commit 368af101ef.
2012-06-01 02:07:11 +02:00
Laurent Destailleur
3dcf553a47 Revert "New: update jQuery and jQuery UI"
This reverts commit 7ed980fab5.
2012-06-01 02:07:02 +02:00
Laurent Destailleur
f9bda74e22 Revert "Fix: stock message in session and reload the page for avoid url problem with jQuery fileupload"
This reverts commit 4deeb20dd8.
2012-06-01 02:06:53 +02:00
Laurent Destailleur
73f1d8ee99 Revert "Fix: more clean code for new version of jQuery fileupload"
This reverts commit d7308525ae.
2012-06-01 02:06:43 +02:00
Laurent Destailleur
1a73347866 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-01 01:54:24 +02:00
Regis Houssin
d7308525ae Fix: more clean code for new version of jQuery fileupload 2012-05-31 21:12:40 +02:00
Regis Houssin
4deeb20dd8 Fix: stock message in session and reload the page for avoid url problem
with jQuery fileupload
2012-05-31 21:12:25 +02:00
Raphaël Doursenaud
0a8016e2aa Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2 2012-05-31 10:09:14 +02:00
Regis Houssin
7ed980fab5 New: update jQuery and jQuery UI 2012-05-30 23:40:45 +02:00
Regis Houssin
368af101ef Fix: reload page after file upload completed 2012-05-30 23:37:02 +02:00
Regis Houssin
8b224e9e2d Fix: add max file size 2012-05-30 23:36:50 +02:00
Regis Houssin
03ec0d7cc5 Fix: replace Bootstrap version by jQueryUI version 2012-05-30 23:36:40 +02:00
Regis Houssin
a717297a8c Works on jQuery fileupload upgrade (Todo: css problem) 2012-05-30 23:36:17 +02:00
Raphaël Doursenaud
086a0ae340 Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2 2012-05-30 17:36:04 +02:00
Regis Houssin
599971b27a Merge pull request #214 from simnandez/3.2
Trad: Add translation
2012-05-30 07:40:22 -07:00
Simnandez
f23462a173 Trad: Add translation 2012-05-30 16:28:13 +02:00
Laurent Destailleur
a83c7d0992 Fix: Regression with quot management. Try a better fix. 2012-05-30 12:49:22 +02:00
Laurent Destailleur
f67636d0f3 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-05-30 12:47:58 +02:00
Laurent Destailleur
92fe8ebe1d Fix: js not escaped 2012-05-30 12:33:47 +02:00
Raphaël Doursenaud
2812bfae7a Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2 2012-05-30 10:29:15 +02:00
Regis Houssin
1a969e61e9 Fix: can't delete a files with quote 2012-05-30 08:31:59 +02:00
Laurent Destailleur
fd9565934c A better fix to remove files from document list 2012-05-30 04:11:37 +02:00
Laurent Destailleur
a465814fd4 More fix for canvas features
Conflicts:
	htdocs/product/canvas/product/tpl/card_create.tpl.php
	htdocs/product/fiche.php
2012-05-30 03:50:53 +02:00
Laurent Destailleur
514babeab1 Fix: delete of documents is done by page of element, not by the view
wrapper.

Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/projet/fiche.php
2012-05-30 00:18:11 +02:00
Regis Houssin
caadf396e2 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-05-30 00:09:49 +02:00
Regis Houssin
5c2922a17b Fix: big problem with files upload and more compatible with external
modules

Conflicts:
	htdocs/compta/facture.php
2012-05-30 00:09:38 +02:00
Laurent Destailleur
1618ce29c7 Fix: Return empty image instead of error when file not found. 2012-05-30 00:06:44 +02:00
Laurent Destailleur
f11430dec8 Removed deprecated strings 2012-05-29 22:22:00 +02:00
Laurent Destailleur
ea51673ce7 Update de_de translation (manual translation) 2012-05-29 22:19:02 +02:00
Laurent Destailleur
d9d32bb9f5 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-05-29 22:18:45 +02:00
Raphaël Doursenaud
76f8d1d37c Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2 2012-05-29 10:18:39 +02:00
Regis Houssin
1cbd628971 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-05-29 09:56:20 +02:00
Regis Houssin
46ae38c86d Fix: clone object before all treatment 2012-05-29 09:56:05 +02:00
Laurent Destailleur
b6c9a37415 Fix: Avoid to have a special php module. 2012-05-28 23:06:32 +02:00
Laurent Destailleur
79cafb1c12 Fix: Subscription must use company name when type is "moral" 2012-05-28 22:14:00 +02:00
Regis Houssin
21d30c1b3e Fix: jquery fileupload broken feature 2012-05-25 20:54:45 +02:00
Raphaël Doursenaud
82af0ed28f Fixed a bug preventing invoice sorting by authors 2012-05-25 16:35:46 +02:00
Raphaël Doursenaud
ffaadcc930 Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2 2012-05-24 10:46:18 +02:00
Laurent Destailleur
95b976c3d5 Fix: Bad action reset 2012-05-23 17:49:08 +02:00
Laurent Destailleur
190bcf61e4 Fix: Permissions to see project 2012-05-23 14:30:55 +02:00
Laurent Destailleur
229ae171de Fix: bug on projects visibility for external users 2012-05-23 13:10:51 +02:00
Laurent Destailleur
face8fc0be Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-05-23 13:10:15 +02:00
Laurent Destailleur
72f67f640d Merge pull request #203 from GPCsolutions/3.2
3.2
2012-05-23 02:58:43 -07:00
Laurent Destailleur
0b7b27e795 Fix: extrafield repair was using bad hardcoded values. 2012-05-23 11:50:55 +02:00
Laurent Destailleur
04bb23d9bf Fix: [ bug #411 ] Can't modify most properties 2012-05-23 11:20:59 +02:00
Laurent Destailleur
ed48969630 Fix: [ bug #409 ] List of vat rates for supplier prices must use the
seller country.

Conflicts:
	htdocs/install/mysql/migration/3.1.0-3.2.0.sql
	htdocs/product/fournisseurs.php
2012-05-23 11:07:18 +02:00
Raphaël Doursenaud
96294403e2 Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2 2012-05-22 15:15:07 +02:00
Laurent Destailleur
c1b1dcc5e7 Fix: Translation of payment term/cond 2012-05-21 20:24:20 +02:00
Regis Houssin
646651e731 Merge pull request #206 from FHenry/3.2
3.2
2012-05-21 07:11:38 -07:00
Regis Houssin
90c4e6598b Merge pull request #207 from simnandez/3.2
[ bug #399 ] Bad calculation of local taxes in update line products
2012-05-21 07:10:14 -07:00
juanjo
952864f532 [ bug #399 ] Bad calculation of local taxes in update line products 2012-05-21 15:39:15 +02:00
FHenry
23226ad472 correct bug #410 2012-05-21 11:00:08 +02:00
Laurent Destailleur
6cf8c5c102 Fix: Check for duplicate must ignore spaces before and after 2012-05-21 10:38:48 +02:00
Raphaël Doursenaud
1b1b58ad5a Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2 2012-05-21 10:08:41 +02:00
Laurent Destailleur
1725e5b591 Fix: [ bug #405 ] Late icon always displayed on comm/propal.php 2012-05-21 00:08:36 +02:00
Laurent Destailleur
7a49d56589 Fix: Missing name 2012-05-16 17:07:01 +02:00
Raphaël Doursenaud
43f1fbed01 Trim payment amounts
This allows to ignore trailing characters that may triggers a warning because the payment looks greater than what's
required
2012-05-16 17:03:15 +02:00
Laurent Destailleur
a8913704e9 Fix: W3C 2012-05-16 12:35:21 +02:00
Raphaël Doursenaud
f7476d5727 Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2 2012-05-15 12:04:26 +02:00
Cédric Salvador
68c1fa6c34 Fix: error in syslog call 2012-05-15 11:41:41 +02:00
Laurent Destailleur
94f9fb2e2f Fix: daylight depends also on year (not only month and day) 2012-05-15 00:49:57 +02:00
Regis Houssin
0ade601a11 Fix: add quote with date 2012-05-14 21:08:17 +02:00
Laurent Destailleur
dc1457b96a Fix: Bad timezone function. Daylight was not used. 2012-05-14 21:07:49 +02:00
Laurent Destailleur
ceb5f161f6 Fix: bad translation 2012-05-14 21:07:24 +02:00
Laurent Destailleur
b4440a6b2e Fix: Exclude nltechno modules from demo 2012-05-14 21:06:48 +02:00
Laurent Destailleur
fd362f1108 Fix: Clean sql 2012-05-13 18:04:00 +02:00
Laurent Destailleur
6f1fd1ae53 Fix: pgsql 2012-05-13 17:36:43 +02:00
Laurent Destailleur
5c62e8865a Fix: W3C 2012-05-13 17:11:31 +02:00
Laurent Destailleur
e13696db55 Fix: syntax error in name of pgsql util proc.
Fix: Add a proc to fix pgsql problems.
2012-05-13 16:41:45 +02:00
Laurent Destailleur
964bb0968f Fix: Missing log when error 2012-05-13 14:44:22 +02:00
Laurent Destailleur
91faac4c87 Fix: Bad phpunit test 2012-05-13 14:44:10 +02:00
Laurent Destailleur
06679ede7c Fix: style 2012-05-13 14:43:41 +02:00
Laurent Destailleur
4a4cdc0839 Fix: Style 2012-05-13 14:36:22 +02:00
Laurent Destailleur
ee31359488 Fix: pgsql compatibility not complete. 2012-05-13 14:33:46 +02:00
Laurent Destailleur
230f4f8f57 Fix: Missing lang 2012-05-12 18:31:04 +02:00
Laurent Destailleur
4278a113a0 Fix: hour reported is not user hour. To fix this, we show both hour
"server and user" but only if it differs.

Conflicts:
	htdocs/core/lib/functions2.lib.php
2012-05-12 16:31:51 +02:00
Laurent Destailleur
da0dc3472b Fix: Pb with backtopage
Conflicts:
	htdocs/adherents/fiche.php
2012-05-12 15:59:28 +02:00
Laurent Destailleur
e94b20f684 Fix: SQL error 2012-05-12 15:28:26 +02:00
Laurent Destailleur
be85c5c381 Fix: [ bug #404 ] Impossible d'ajouter un contact lorsque le module LDAP
est actif (erreur Array 1)
2012-05-12 12:34:18 +02:00
Laurent Destailleur
d4ca08db00 Fix: Bug #402 2012-05-11 21:27:29 +02:00
Raphaël Doursenaud
8416014cff Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2 2012-05-11 15:46:23 +02:00
Laurent Destailleur
c0691b01eb Fix: Synchro with group not done when editing group only of a user. 2012-05-11 12:48:29 +02:00
Laurent Destailleur
795310b934 Fix: A lot of fix for LDAP synchro 2012-05-11 12:13:47 +02:00
Raphaël Doursenaud
3e72bdbc87 Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2 2012-05-11 11:48:35 +02:00
Regis Houssin
791c08c006 Fix: [Bug #403] Insertion Image via l'éditeur WISIWIG plante 2012-05-11 10:15:10 +02:00
Laurent Destailleur
7c7d0bd495 Fix: vat rates 2012-05-10 23:08:19 +02:00
Laurent Destailleur
9bd8e3434e Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-05-10 22:51:30 +02:00
Laurent Destailleur
a8f69ad16f Update pad files for 3.2 2012-05-10 22:43:50 +02:00
Regis Houssin
fc46a1ff97 Fix: fetch object for hookmanager 2012-05-10 19:30:54 +02:00
Raphaël Doursenaud
decdc2a9a3 Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2 2012-05-10 15:05:02 +02:00
Laurent Destailleur
bd0be8f358 Fix: escape html tag value 2012-05-09 20:41:41 +02:00
Laurent Destailleur
7700293bdf Fix: Bad warning 2012-05-09 18:17:18 +02:00
Laurent Destailleur
60c77f3d50 Fix: Bad warning 2012-05-09 17:59:54 +02:00
Laurent Destailleur
9f770d862d Fix: Not escaped html value 2012-05-09 17:48:10 +02:00
Laurent Destailleur
ca67f976b6 Fix: Validate broken, missing warning on bad email. 2012-05-09 17:18:56 +02:00
Laurent Destailleur
e722138608 Fix: regression sql error
Conflicts:
	htdocs/core/modules/mailings/modules_mailings.php
2012-05-09 17:18:07 +02:00
Laurent Destailleur
32d2b0a9d6 Fix: Warning GETPOST with alpha and int must be used ONLY if content is
not a free text.
2012-05-09 16:19:54 +02:00
Laurent Destailleur
30026ecddb Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-05-09 16:03:57 +02:00
Laurent Destailleur
d53a56f13f Fix: Missing extrafields 2012-05-09 16:02:26 +02:00
Laurent Destailleur
49c7a1f2b4 Fix: Fails to delete member 2012-05-09 15:21:43 +02:00
Regis Houssin
b9b2dbe9b1 Fix: more compatibility with multicompany 2012-05-09 12:44:30 +02:00
Regis Houssin
1726720d16 Merge pull request #198 from simnandez/3.2
3.2
2012-05-09 01:49:32 -07:00
simnandez
84a09808fc Fix:[ bug #399 ] Bad calculation of local taxes in update line products 2012-05-09 10:29:12 +02:00
Laurent Destailleur
f47d6c71ed Fix: Regression in packager 2012-05-08 23:56:51 +02:00
Laurent Destailleur
b623392062 Fix: Load lang 2012-05-08 23:00:13 +02:00
Laurent Destailleur
425ca83a99 Fix: [ bug #397 ] Product VAT is not coming from buying price 2012-05-08 21:55:52 +02:00
Laurent Destailleur
15efd9e8a1 Fix: update price for pgsql 2012-05-08 19:34:12 +02:00
Laurent Destailleur
50443f1977 Fix: Missing error management 2012-05-08 15:39:20 +02:00
Laurent Destailleur
2bb87aabbe Fix: bad br 2012-05-07 20:46:18 +02:00
Laurent Destailleur
2519690020 Fix: corrupted extra tables. 2012-05-07 20:44:20 +02:00
Raphaël Doursenaud
ea0e05b07c Fix: Typo 2012-05-07 19:07:59 +02:00
Laurent Destailleur
21d028c064 Fix: Width of gantt chart 2012-05-07 19:07:29 +02:00
Laurent Destailleur
c9a35c4e3a Too shadow with IE 2012-05-07 19:07:13 +02:00
Laurent Destailleur
22006aa4dc Fix: Better fix for gant view 2012-05-07 19:06:43 +02:00
Laurent Destailleur
82b31e1f5b Fix: Works with checkbox htdocs/core/class/html.form.class.php 2012-05-07 19:06:23 +02:00
Raphaël Doursenaud
7a3ef9bf8a Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2 2012-05-07 15:52:48 +02:00
Regis Houssin
d0480f1d90 Fix: wrong permission 2012-05-07 11:16:09 +02:00
Raphaël Doursenaud
9b4b8db189 Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2 2012-05-07 10:04:35 +02:00
Regis Houssin
562be023c6 Fix: [Bug #384] Gantt doesn't display beyond 20 tasks 2012-05-07 09:59:36 +02:00
Laurent Destailleur
4799c6692e Fix: Removed warning and fix pb with extra fields. 2012-05-06 20:54:58 +02:00
Laurent Destailleur
01d37ad159 Fix: pagecode when using postgresql 2012-05-06 15:31:43 +02:00
Laurent Destailleur
1b2a4f4742 Fix: log must be before request 2012-05-06 15:28:51 +02:00
Laurent Destailleur
bfba7bbc7f Fix: foreign key on non existing field 2012-05-06 15:27:31 +02:00
Laurent Destailleur
8d95ae1884 Fix: Typo 2012-05-06 02:36:55 +02:00
Laurent Destailleur
748ac3a5a7 Fix: setStatut works for user class 2012-05-06 00:06:07 +02:00
Laurent Destailleur
5ea6b99593 Fix: several fixes 2012-05-06 00:03:54 +02:00
Regis Houssin
33b9c5af45 Fix: [bug #385] Can't delete a task 2012-05-05 09:28:40 +02:00
Regis Houssin
85e797596f Fix: [Bug #388] Can't modify products after moving with arrows 2012-05-05 09:20:47 +02:00
Regis Houssin
34fe219dcb Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-05-05 09:03:21 +02:00
Regis Houssin
2fe16db244 Fix: bad parameters 2012-05-05 09:03:04 +02:00
Laurent Destailleur
ebf73de8cd Fix: % must be sprintf format. 2012-05-05 03:02:13 +02:00
Laurent Destailleur
b26c3266ed Fix: Manual fix of italian language 2012-05-05 02:58:59 +02:00
Regis Houssin
f4759a0e6e Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-05-04 13:21:50 +02:00
Regis Houssin
656d4942a6 Fix: MultiCompany compatibility for public page 2012-05-04 13:21:28 +02:00
Laurent Destailleur
7921965fe2 Fix: Use correct dest dir. 2012-05-03 23:13:21 +02:00
Laurent Destailleur
5953f18f54 Fix: filter on status 2012-05-03 22:58:51 +02:00
Laurent Destailleur
7a6a462ef2 Fix: Bad cr 2012-05-03 22:13:23 +02:00
Regis Houssin
21a4dd9685 Fix: missing entity field in contract
Fix: multicompany compatibility

Conflicts:
	htdocs/contrat/class/contrat.class.php
2012-05-03 18:45:26 +02:00
Regis Houssin
41e8011a80 Fix: changelog 2012-05-03 11:29:59 +02:00
Regis Houssin
46987ea4bd Merge pull request #193 from simnandez/3.2
Trad: add missing translations
2012-05-02 09:21:02 -07:00
simnandez
6c7206d210 Trad: add missing translations 2012-05-02 18:17:21 +02:00
Laurent Destailleur
39e34357a1 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-05-02 17:33:26 +02:00
Laurent Destailleur
557c96455e Fix: Use de_De language for de_de, not de_at 2012-05-02 17:30:02 +02:00
Raphaël Doursenaud
ea07afd6c2 Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2 2012-05-02 17:29:16 +02:00
Laurent Destailleur
7e933ca175 Merge pull request #191 from simnandez/3.2
Trad: [ bug #378 ] status for order i, process is "waiting for reception"
2012-05-02 07:35:03 -07:00
Laurent Destailleur
47c0b8272d Fix: Middle
Conflicts:
	htdocs/core/tpl/login.tpl.php
2012-05-02 14:19:34 +02:00
Laurent Destailleur
afd9b817be Fix: Missing translation 2012-05-02 13:42:49 +02:00
Laurent Destailleur
f5cc12895a Fix: Missing picto 2012-05-02 13:42:34 +02:00
simnandez
c7daf233cd Trad: [ bug #378 ] status for order i, process is "waiting for
reception"
2012-05-02 09:21:52 +02:00
Laurent Destailleur
9edd80b850 Fix: Clean database to allow constraints 2012-05-01 15:28:11 +02:00
Laurent Destailleur
67adc11086 Fix: [ bug #378 ] status for order i, process is "waiting for reception" 2012-05-01 15:09:50 +02:00
Laurent Destailleur
129bb0cf2f Fix: awful IE 2012-04-30 19:15:16 +02:00
Laurent Destailleur
69b429914f Fix: Firstname/Lastname lost
Conflicts:
	htdocs/admin/tools/update.php
2012-04-30 19:03:14 +02:00
Laurent Destailleur
74887b5850 Fix: Removed warnings 2012-04-30 09:33:43 +02:00
Laurent Destailleur
3641a4b5bb Fix: Regression 2012-04-29 21:49:03 +02:00
Laurent Destailleur
d4d598d0aa Fix: left align 2012-04-28 20:51:51 +02:00
Laurent Destailleur
450ccf31a7 Fix: Bad declaration of error_reporting
Conflicts:
	htdocs/filefunc.inc.php
2012-04-28 18:52:05 +02:00
Laurent Destailleur
6b9717b250 Fix: Use same algo to scan modules than admin/modules page 2012-04-28 18:50:30 +02:00
Laurent Destailleur
2a19e9d2a1 Fix: Var can't be static 2012-04-28 18:24:53 +02:00
Laurent Destailleur
9200847eaa Fix: Try a better fix. Format of content of table should depend of
content and output rules and not on how data was input.
2012-04-28 15:44:04 +02:00
Laurent Destailleur
3918335bf7 No new feature into a beta. Also this feature is a security
hole for the moment, so it should not be enabled as a common default
feautre but must be kept hidden.
2012-04-28 15:32:48 +02:00
Laurent Destailleur
99006125fd Fix: export of print sheets 2012-04-28 14:57:16 +02:00
Raphaël Doursenaud
dfcfb48057 Typo: instantanée ne prend qu'un n. 2012-04-26 15:48:22 +02:00
Raphaël Doursenaud
62ecc497fa Fix: typo in unset 2012-04-26 15:43:27 +02:00
Regis Houssin
f7b0e1a976 Merge pull request #178 from simnandez/3.2
Fix: Bad include
2012-04-26 01:50:43 -07:00
Regis Houssin
0092f1bc89 Fix: problem of line break between label and description when
using fckeditor
2012-04-26 10:29:46 +02:00
simnandez
6e84b8ca63 Fix: Bad include 2012-04-26 08:50:39 +02:00
FHenry
fa0e1ca87e remove useless line 2012-04-25 18:37:16 +02:00
FHenry
58df839271 Rename global variable from MAIN_SOCIETE_UNSUBSCRIBE to
MAILING_EMAIL_UNSUBSCRIBE to be reliable on dolibarr implementation

Conflicts:
	htdocs/admin/mailing.php
2012-04-25 18:36:58 +02:00
FHenry
d5b21a05b2 Remove Eclipse variable warning 2012-04-25 18:33:30 +02:00
FHenry
455789d575 Remove Eclipse Warning (Undeclare variable) 2012-04-25 18:33:09 +02:00
Regis Houssin
965057307f Merge pull request #176 from simnandez/3.2
Update ChangeLog with fixes
2012-04-25 09:27:38 -07:00
simnandez
2515d27d19 Update ChangeLog with fixes 2012-04-22 18:17:16 +02:00
Laurent Destailleur
d390f3137f Fix: [ bug #367 ] "Multi-tiers" fonctionality inverted in project
contacts.
2012-04-21 19:44:05 +02:00
Laurent Destailleur
2b77a99fa3 Fix: [ bug #372 ] Upgrade error from 3.1.0 to 3.2.0 Beta 2012-04-21 19:12:20 +02:00
Laurent Destailleur
3a2caa3e46 Fix: Try a fix for the lost mainmenu session. 2012-04-20 20:38:49 +02:00
Laurent Destailleur
a9c03aa01e Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
2012-04-20 14:50:09 +02:00
Laurent Destailleur
32339b03fd Add log to try to find the mainmenu lost bug. 2012-04-20 14:48:40 +02:00
Laurent Destailleur
52f324002c Add log to try to find the mainmenu lost bug. 2012-04-20 14:39:20 +02:00
Laurent Destailleur
db53aa53b6 Fix: Lines useless 2012-04-20 14:24:02 +02:00
Laurent Destailleur
ab80f6aaa7 Fix: Can clone a proposal 2012-04-20 14:06:59 +02:00
Laurent Destailleur
eff43a8e0c Fix: wrong encoding of special chars 2012-04-20 13:59:35 +02:00
Laurent Destailleur
e503b2d858 Fix: Field must be reset after adding. 2012-04-20 13:50:23 +02:00
Laurent Destailleur
216df5ad07 Fix: Add hidden option to restore lost feature. 2012-04-20 13:46:40 +02:00
Laurent Destailleur
907c7f748d Fix: Bad CR for public note. Must work when text is full text with \n
and also when text is HTML with br.
2012-04-20 13:41:55 +02:00
Laurent Destailleur
91b8f33ea5 Fix: textarea field was not detected 2012-04-20 13:36:51 +02:00
Laurent Destailleur
5580a4cc30 Fix: Missing translation 2012-04-20 13:23:57 +02:00
Laurent Destailleur
cb8b5188be Change to help to fight the mainmenu lost bug. 2012-04-20 13:08:58 +02:00
Laurent Destailleur
8e9f3cabf3 Fix: left menu for home menu 2012-04-20 12:52:36 +02:00
Laurent Destailleur
c31c40a61e Fix: Force mainmenu. This does not solve completely bug of eaccelerator
but provide a way to have access to system menu to help to diagnose.
2012-04-20 12:10:55 +02:00
Raphaël Doursenaud
6958fe9693 Merge remote-tracking branch 'upstream/3.2' into 3.2 2012-04-20 11:06:09 +02:00
Laurent Destailleur
e0e3c07670 Fix: upload dir 2012-04-20 09:43:44 +02:00
Laurent Destailleur
64c4d59466 Merge pull request #173 from simnandez/3.2
Fix: [ bug #368 ] Product list
2012-04-20 00:29:54 -07:00
simnandez
312f81004f Fix: [ bug #370 ] Filter in accountancy -> suppliers_bills 2012-04-19 20:20:08 +02:00
simnandez
5f001c1079 Fix: [ bug #370 ] Filter in accountancy -> suppliers_bills 2012-04-19 20:14:37 +02:00
simnandez
12a3ce7746 Fix: [ bug #368 ] Product list 2012-04-19 19:10:21 +02:00
Regis Houssin
6b07571f09 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-04-18 18:54:37 +02:00
Laurent Destailleur
294cc73481 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-04-18 17:17:00 +02:00
Laurent Destailleur
0f20381453 Fix: Script to build package for doliwamp is now ok. 2012-04-18 17:16:07 +02:00
Laurent Destailleur
2187f3fda7 Fix: Bad case 2012-04-18 15:38:29 +02:00
Regis Houssin
5f7d552c71 Fix: Bug #369 2012-04-18 12:43:17 +02:00
Regis Houssin
ef36cbc1be Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-04-18 12:21:44 +02:00
Laurent Destailleur
5b609c7ea1 Fix: project info are not lost when submiting actions on tasks 2012-04-18 12:21:12 +02:00
Laurent Destailleur
672dc99145 Fix: project info are not lost when submiting actions on tasks 2012-04-18 12:16:35 +02:00
Laurent Destailleur
54f588cb90 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-04-18 12:16:04 +02:00
Laurent Destailleur
7cb3e6f780 Fix: Restore broken feature 2012-04-18 11:56:52 +02:00
Laurent Destailleur
d41d516072 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-04-18 11:52:49 +02:00
FHenry
f235caf4ec Fix: Bug #362 and clean code 2012-04-18 11:17:26 +02:00
Laurent Destailleur
4ddb9023d7 Fix: restore broken features 2012-04-18 01:04:26 +02:00
Laurent Destailleur
ca7fa84d80 Fix: eldy theme still works without css3 2012-04-17 10:34:54 +02:00
Cédric Salvador
6e291ad70f Merge remote-tracking branch 'upstream/3.2' into 3.2
Conflicts:
	htdocs/core/class/conf.class.php
2012-04-16 15:32:39 +02:00
Laurent Destailleur
435ee2cc26 Fix: Must use tms date 2012-04-16 12:12:03 +02:00
Regis Houssin
6c7eb59f31 Fix: remove unnecessary function 2012-04-16 11:40:24 +02:00
Laurent Destailleur
ab94865c71 Fix: Generate donation document 2012-04-16 01:28:10 +02:00
Laurent Destailleur
8ec22d9f67 Fix: numbering when reset is on was wrong for past dates 2012-04-15 20:33:13 +02:00
Laurent Destailleur
fb59b5c69a Fix: date must be quoted 2012-04-15 19:20:39 +02:00
Laurent Destailleur
a31a74134c Fix: date must be quoted 2012-04-15 19:18:44 +02:00
Laurent Destailleur
5169437c2d Fix: commit at wrong place 2012-04-15 18:51:42 +02:00
Regis Houssin
f9b2f29547 Fix: sorry it's ok 2012-04-15 18:33:49 +02:00
Regis Houssin
64ddee017b Fix: you can not delete project document folder in delete task method 2012-04-15 18:18:16 +02:00
FHenry
1a56c5b021 correct bug 364 2012-04-15 17:52:47 +02:00
FHenry
779e33d490 Corect bug #364 2012-04-15 17:52:38 +02:00
FHenry
c628cfd99a Correct bug 363 2012-04-15 17:52:28 +02:00
FHenry
3abffac52a Correct bug #363 2012-04-15 17:52:13 +02:00
Laurent Destailleur
25640853f5 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-04-15 15:22:12 +02:00
Laurent Destailleur
b0c55c77c3 Fix: dump file to use must be last one 2012-04-15 15:21:24 +02:00
Regis Houssin
a17f7d1041 Fix: security update for multicompany
Conflicts:
	htdocs/adherents/fiche.php
2012-04-15 11:32:21 +02:00
Regis Houssin
779eacd9c1 Fix: right access error 2012-04-15 10:10:55 +02:00
Regis Houssin
a4359d6eaa Fix: disable php display errors with $dolibarr_main_prod 2012-04-15 09:33:03 +02:00
Laurent Destailleur
c3040f9609 Germany data not complete. 2012-04-14 19:30:10 +02:00
Laurent Destailleur
e446d8c7a2 Fix: Some bug into rpm and debian packaging. 2012-04-14 15:36:12 +02:00
Laurent Destailleur
6212d1a425 Fix: licence pb with fedora 2012-04-14 13:25:26 +02:00
Laurent Destailleur
42c8b25597 Fix: rpm packages 2012-04-14 13:02:21 +02:00
Laurent Destailleur
381ce5fee3 Fix: bad permissions 2012-04-14 12:41:08 +02:00
Laurent Destailleur
71c43c9069 Fix: debian epiphany and iceweasel browsers. 2012-04-14 03:18:42 +02:00
Laurent Destailleur
2ee9ca9c79 Fix: logo size was too large 2012-04-14 02:52:14 +02:00
Laurent Destailleur
16fccd7892 Fix: Work with debian 6 2012-04-14 02:43:34 +02:00
Laurent Destailleur
346fd0d09b Revert "Fix: plugin not into debian"
This reverts commit 4f5456c8d8.
2012-04-14 01:35:41 +02:00
Laurent Destailleur
4f5456c8d8 Fix: plugin not into debian 2012-04-14 01:22:54 +02:00
Laurent Destailleur
a8f66a9b09 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-04-13 20:08:37 +02:00
Laurent Destailleur
ab52d046b9 Fix: Avoid error when removing not correctly installed package 2012-04-13 19:55:14 +02:00
Laurent Destailleur
7e843d855a Fix: regression 2012-04-13 19:49:21 +02:00
FHenry
a11e4ceb44 Correction Bug #358 2012-04-13 19:14:05 +02:00
Regis Houssin
4f490f3e2d New: add possibility to define a page break, its very important for
internal and external modules (milestone)
2012-04-12 20:53:31 +02:00
FHenry
28aa89c659 correct bug #360 2012-04-12 11:18:55 +02:00
Laurent Destailleur
0e4ca576ec Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-04-12 00:02:28 +02:00
Laurent Destailleur
53a78838f8 Fix: Avoid call if function not defined 2012-04-11 17:28:04 +02:00
Regis Houssin
eb6008bb4d Fix: missing langs object 2012-04-11 16:27:39 +02:00
Laurent Destailleur
a748466758 Fix: this must not be used inside static classes 2012-04-11 14:45:12 +02:00
Laurent Destailleur
c7317ed2a1 Add dump of 3.2.0 demo 2012-04-11 12:14:55 +02:00
Laurent Destailleur
1e526a2a03 Revert "uniformise code"
This reverts commit 06761d9753.
2012-04-11 10:49:46 +02:00
Laurent Destailleur
b141f3caf5 Revert "to add delivery date"
This reverts commit 8a20b670e7.
2012-04-11 10:49:18 +02:00
Laurent Destailleur
5aae71f9de Revert "to add delivery date"
This reverts commit b948ee1212.
2012-04-11 10:48:35 +02:00
Laurent Destailleur
bb917bea08 Revert "Add __MAILTOEMAIL__ and configutation gobal varialbe of Check Read and unsubscribe in Admin part"
This reverts commit 2a12b24644.
2012-04-11 10:48:02 +02:00
Laurent Destailleur
3870428f16 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-04-11 10:46:06 +02:00
Laurent Destailleur
307c010b90 Fix: Removed warning 2012-04-11 08:32:29 +02:00
Regis Houssin
d7e579e234 Fix: invert emetteur and problem with long phone number 2012-04-11 08:32:00 +02:00
Regis Houssin
45e34aba65 Fix: missing company logo and invert from to ! 2012-04-11 08:31:47 +02:00
FHenry
2a12b24644 Add __MAILTOEMAIL__ and configutation gobal varialbe of Check Read and
unsubscribe in Admin part
2012-04-11 08:24:52 +02:00
Grand Philippe
b948ee1212 to add delivery date 2012-04-11 08:20:48 +02:00
Grand Philippe
8a20b670e7 to add delivery date 2012-04-11 08:20:37 +02:00
Regis Houssin
6ef98b3d46 Fix: restore dolibarr version for this branch 2012-04-11 08:11:27 +02:00
Laurent Destailleur
d3198894b8 Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2 2012-04-10 12:40:23 +02:00
Laurent Destailleur
231fd6b2ae Fix: Removed warning 2012-04-10 12:37:53 +02:00
Regis Houssin
8f32a35faa Fix: invert emetteur and problem with long phone number 2012-04-10 12:34:02 +02:00
Regis Houssin
6616254504 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-04-10 12:06:37 +02:00
Regis Houssin
a98e57c596 Fix: missing company logo and invert from to ! 2012-04-10 12:06:26 +02:00
Laurent Destailleur
d4cc4b4288 Fix: bad link 2012-04-10 11:16:47 +02:00
Laurent Destailleur
1104387b72 Fix: Bad link 2012-04-10 11:13:15 +02:00
Laurent Destailleur
49bb9d774d Fix: W3C 2012-04-10 11:00:56 +02:00
Laurent Destailleur
58b0751599 Fix: translation 2012-04-10 10:55:03 +02:00
Regis Houssin
dc46b82cf3 Fix: best practice 2012-04-10 08:44:43 +02:00
Laurent Destailleur
141fa014e6 Revert code because it does not fix security hole completely. Also it
does work on origin but at a transition level.
Sanitizing for command line data must not appears inside a function used
for http data. I prefer fixing this at the source and also using a rule
that clean all attacks completely instead of a rule that clean "most
problem but not all".
2012-04-10 01:24:52 +02:00
Laurent Destailleur
b6b873cfc5 Revert "Fix: security"
This reverts commit 56daf57cb1.
2012-04-10 01:11:37 +02:00
Regis Houssin
ae8b16b9fc Fix: add special test 2012-04-09 22:53:28 +02:00
Regis Houssin
64d60d1270 Fix: sql injection 2012-04-09 22:49:19 +02:00
Regis Houssin
56daf57cb1 Fix: security 2012-04-09 22:27:40 +02:00
Laurent Destailleur
9a4314947d Fix: Rounding 2012-04-09 09:00:24 +02:00
Laurent Destailleur
d892f36fe8 Fix: rounding 2012-04-09 08:59:29 +02:00
Laurent Destailleur
4804530468 Fix: Back page to list of contacts(cherry picked from commit 2d9ed89a8d) 2012-04-09 01:13:45 +02:00
Laurent Destailleur
06b0330d84 New logo 2012-04-08 23:33:07 +02:00
17848 changed files with 941767 additions and 3611345 deletions

View File

@@ -1,13 +0,0 @@
# Save as .codeclimate.yml (note leading .) in project root directory
languages:
Ruby: false
JavaScript: true
PHP: true
engines:
phpcodesniffer: true
exclude_paths:
- 'build/*'
- 'dev/*'
- 'doc/*'
- 'test/*'
- 'htdocs/includes/*'

View File

@@ -1,28 +0,0 @@
# EditorConfig is awesome: https://editorconfig.org
# top-most EditorConfig file
root = true
# Unix-style newlines with a newline ending every file
[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
[*.php]
indent_style = tab
indent_size = 4
trim_trailing_whitespace = true
insert_final_newline = true
[*.js]
indent_style = tab
[*.css]
indent_style = tab
[*.xml]
indent_style = tab
[*.md]
trim_trailing_whitespace = false
[*.sql]
indent_style = tab
trim_trailing_whitespace = true
indent_size = 4

58
.gitattributes vendored
View File

@@ -1,58 +0,0 @@
# Set default behaviour, in case users don't have core.autocrlf set.
# More info: https://help.github.com/articles/dealing-with-line-endings
* text=auto
# Explicitly declare text files we want to always be normalized and converted
# to native line endings on checkout.
*.php text eol=lf
*.pl text eol=lf
*.sql text eol=lf
*.htm text eol=lf
*.html text eol=lf
*.js text eol=lf
*.json text eol=lf
*.css text eol=lf
*.lang text eol=lf
*.txt text eol=lf
*.md text eol=lf
*.pp text eol=lf
*.sh text eol=lf
*.yml text eol=lf
*.yaml text eol=lf
*.conf text eol=lf
*.neon text eol=lf
.bash_aliases text eol=lf
# Denote all files that are truly binary and should not be modified.
*.bmp binary
*.frm binary
*.ico binary
*.jpeg binary
*.jpg binary
*.MYD binary
*.MYI binary
*.odf binary
*.odt binary
*.png binary
# Export ignores to generate clean production tarballs
/build export-ignore
/dev export-ignore
/doc export-ignore
/test export-ignore
.buildpath export-ignore
/build.xml export-ignore
.codeclimate.yml export-ignore
Dockerfile export-ignore
.dockerignore export-ignore
.editorconfig export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.mailmap export-ignore
.scrutinizer.yml export-ignore
.settings export-ignore
.travis.yml export-ignore
.tx export-ignore

1
.github/CODEOWNERS vendored
View File

@@ -1 +0,0 @@
htdocs/takepos @andreubisquerra

View File

@@ -1,84 +0,0 @@
# Code of Conduct
## 1. Purpose
A primary goal of Dolibarr is to be inclusive to the largest number of contributors, with the most varied and diverse backgrounds possible. As such, we are committed to providing a friendly, safe and welcoming environment for all, regardless of gender, sexual orientation, ability, ethnicity, socioeconomic status, and religion (or lack thereof).
This code of conduct outlines our expectations for all those who participate in our community, as well as the consequences for unacceptable behavior.
We invite all those who participate in Dolibarr to help us create safe and positive experiences for everyone.
## 2. Open Source Citizenship
A supplemental goal of this Code of Conduct is to increase open source citizenship by encouraging participants to recognize and strengthen the relationships between our actions and their effects on our community.
Communities mirror the societies in which they exist and positive action is essential to counteract the many forms of inequality and abuses of power that exist in society.
If you see someone who is making an extra effort to ensure our community is welcoming, friendly, and encourages all participants to contribute to the fullest extent, we want to know.
## 3. Expected Behavior
The following behaviors are expected and requested of all community members:
* Participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community.
* Exercise consideration and respect in your speech and actions.
* Attempt collaboration before conflict.
* Refrain from demeaning, discriminatory, or harassing behavior and speech.
* Be mindful of your surroundings and of your fellow participants. Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential.
* Remember that community event venues may be shared with members of the public; please be respectful to all patrons of these locations.
## 4. Unacceptable Behavior
The following behaviors are considered harassment and are unacceptable within our community:
* Violence, threats of violence or violent language directed against another person.
* Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language.
* Posting or displaying sexually explicit or violent material.
* Posting or threatening to post other peoples personally identifying information ("doxing").
* Personal insults, particularly those related to gender, sexual orientation, race, religion, or disability.
* Inappropriate photography or recording.
* Inappropriate physical contact. You should have someones consent before touching them.
* Unwelcome sexual attention. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcomed sexual advances.
* Deliberate intimidation, stalking or following (online or in person).
* Advocating for, or encouraging, any of the above behavior.
* Sustained disruption of community events, including talks and presentations.
## 5. Consequences of Unacceptable Behavior
Unacceptable behavior from any community member, including sponsors and those with decision-making authority, will not be tolerated.
Anyone asked to stop unacceptable behavior is expected to comply immediately.
If a community member engages in unacceptable behavior, the community organizers may take any action they deem appropriate, up to and including a temporary ban or permanent expulsion from the community without warning (and without refund in the case of a paid event).
## 6. Reporting Guidelines
If you are subject to or witness unacceptable behavior, or have any other concerns, please notify a community organizer as soon as possible. contact@dolibarr.org.
Additionally, community organizers are available to help community members engage with local law enforcement or to otherwise help those experiencing unacceptable behavior feel safe. In the context of in-person events, organizers will also provide escorts as desired by the person experiencing distress.
## 7. Addressing Grievances
If you feel you have been falsely or unfairly accused of violating this Code of Conduct, you should notify Dolibarr with a concise description of your grievance. Your grievance will be handled in accordance with our existing governing policies.
## 8. Scope
We expect all community participants (contributors, paid or otherwise; sponsors; and other guests) to abide by this Code of Conduct in all community venuesonline and in-personas well as in all one-on-one communications pertaining to community business.
This code of conduct and its related procedures also applies to unacceptable behavior occurring outside the scope of community activities when such behavior has the potential to adversely affect the safety and well-being of community members.
## 9. Contact info
contact@dolibarr.org
## 10. License and attribution
This Code of Conduct is distributed under a [Creative Commons Attribution-ShareAlike license](https://creativecommons.org/licenses/by-sa/3.0/).
Portions of text derived from the [Django Code of Conduct](https://www.djangoproject.com/conduct/) and the [Geek Feminism Anti-Harassment Policy](https://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy).
Retrieved on November 22, 2016 from [https://citizencodeofconduct.org/](http://citizencodeofconduct.org/)

View File

@@ -1,173 +0,0 @@
How to contribute to Dolibarr
=============================
Bug reports and feature requests
--------------------------------
<a name="not-a-support-forum"></a>*Note*: **GitHub Issues is not a support forum.** If you have questions about Dolibarr / need help using the software, please use [the forums](https://www.dolibarr.org/forum.php). Forums exist in different languages.
Issues are managed on [GitHub](https://github.com/Dolibarr/dolibarr/issues).
Default **language here is English**. So please prepare your contributions in English.
1. Please [use the search engine](https://help.github.com/articles/searching-issues) to check if nobody's already reported your problem.
2. [Create an issue](https://help.github.com/articles/creating-an-issue). Choose an appropriate title. Prepend appropriately with Bug or Feature Request.
3. Tell us the version you are using! (look at /htdocs/admin/system/dolibarr.php? and check if you are using the latest version)
4. Write a report with as much detail as possible (Use [screenshots](https://help.github.com/articles/issue-attachments) or even screencasts and provide logging and debugging information whenever possible).
5. Delete unnecessary submissions.
6. **Check your Message at Preview before sending.**
<a name="code"></a>Submit code
---------------------
### Basic workflow
1. [Fork](https://help.github.com/articles/fork-a-repo) the [GitHub repository](https://github.com/Dolibarr/dolibarr).
2. Clone your fork.
3. Choose a branch(See the [Branches](#branches) section below).
4. Read our developer documentation on the [Dolibarr Wiki](https://wiki.dolibarr.org/index.php?title=Developer_documentation).
5. Commit and push your changes.
6. [Make a pull request](https://help.github.com/articles/creating-a-pull-request).
<span id="branches" name="branches"></span>
### Branches
Unless you're fixing a bug, all pull requests should be made against the *develop* branch.
If you're fixing a bug, it is preferred that you cook your fix and pull request it against an oldest version affected.
We recommend to push it into N - 2 for N the latest version available, if not possible into version N - 1, and finally into develop.
This is just a recommendation, currently, if you push a bug fix on a very old version, it is still merged and propagated into
higher versions.
The rule N - 2 is just a tip if you don't know which version to choose to get the best the best compromise between ease of correction
and number of potential beneficiaries of the correction.
### General rules
Please don't edit the ChangeLog file. This file is generated from all commit messages during release process by the project manager.
### <a name="commits"></a>Commits
Use clear commit messages with the following structure:
```plaintext
[KEYWORD] [ISSUENUM] DESC
LONGDESC
```
We provide a [.gitmessage](/.gitmessage) file to help you fit the template.
You can add it to your git configuration using:
```
git config --local commit.template .gitmessage
```
where
#### Keyword
In uppercase if you want to have the log comment appears into the generated ChangeLog file.
The keyword can be omitted if your commit does not fit in any of the following categories:
- Fix/FIX: for a bug fix
- Close/CLOSE: for closing a referenced feature request
- New/NEW: for an unreferenced new feature (Opening a feature request and using close is preferred)
- Perf/PERF: for a performance enhancement
- Qual/QUAL: for quality code enhancement or re-engineering
#### Issuenum
If your commit fixes a referenced bug or feature request.
In the form of a # followed by the GitHub issue number.
#### Desc
A short description of the commit content.
This should ideally be less than 50 characters.
#### LongDesc
A long description of the commit content.
You can really go to town here and explain in depth what you've been doing.
Feel free to express technical details, use cases or anything relevant to the current commit.
This section can span multiple lines.
If your PR is a change on interface, you must also paste a screenshot showing the new screen.
#### Examples
<pre>
FIX|Fix #456 Short description (where #456 is number of bug fix, if it exists. In upper case to appear into ChangeLog)
or
CLOSE|Close #456 Short description (where #456 is number of feature request, if it exists. In upper case to appear into ChangeLog)
or
NEW|New|QUAL|Qual|PERF|Perf Short description (In upper case to appear into ChangeLog, use this if you add a feature not tracked, otherwise use CLOSE #456)
or
Short description (when the commit is not introducing feature nor closing a bug)
Long description (Can span across multiple lines).
</pre>
### Pull Requests
Pull Request (PR) process is the process to submit a change (enhancement, bug fix, ...) into the code of the project. There is some rules to know and
a process to follow to optimize the chance to have PRs merged efficiently...
* A PR must be atomic. It means it must contains the lower possible changes for 1 need (1 bug fix or 1 new feature) without breaking usability of code. If a PR can be split into several PRs, it often means your PR is not atomic.
* Your Pull Request (PR) must pass the Continuous Integration checks and code quality checks.
* When submitting a pull request, use same rule as [Commits](#commits) for the message. If your pull request only contains 1 commit, GitHub will be smart enough to fill it for you. Otherwise, please be a bit verbose about what you're providing.
* A screenshot will be always required for any PR of change/addition of a GUI behaviour.
Also, some code changes need a prior approbation:
* if you want to include a new external library (into htdocs/includes directory), please ask before to the core project manager (mention @dolibarr-jedi in your issue) to see if such a library can be accepted.
* if you add new tables or fields, you MUST first submit a standalone PR with the data structure changes you plan to add/modify (and only data structure changes). Start development only once this data structure has been accepted.
Once a PR has been submitted, you may need to wait for its integration. It is common that the project leader let the PR open for a long delay to allow every developer discuss about the PR (A label is added in such a case).
If the label of PR start with "Draft" or "WIP" (Work In Progress), it will not be analyzed for merging until you change the label of the PR (but it can be analyzed for discussion).
If your PR has errors reported by the Continuous Integration Platform, it means your PR is not valid and nothing will be done with it. It will be kept open to allow developers to fix this, or it may be closed several month later. Don't expect anything on your PR if you have such errors, you MUST first fix the Continuous Integration error to have it taken into consideration.
If the PR is valid, and is kept open for a long time, a tag will also be added on the PR to describe the status of your PR and why the PR is kept open. By putting your mouse on the tag, you will get a full explanation of the tag/status that explain why your PR has not been integrated yet.
In most cases, it gives you information of things you have to do to have the PR taken into consideration (for example a change is requested, a conflict is expected to be solved, some questions were asked). If you have a yellow, red flag of purple flag, don't expect to have your PR validated. You must first provide the answer the tag ask you. The majority of open PR are waiting an action of the author of the PR.
Statistics on Dolibarr project shows that 95% of submitted PR are reviewed and tagged. Average answer delay is also one of the best among Open source projects (just few days before having the Answer Tag set). This is one of the most important ratio of answered PR in Open Source world for a major project. Don't expect the core team to reach the 100%.
A so high ratio is very rare on a so popular project and with the increasing popularity of Dolibarr, this ratio will probably decrease in future to a more common level.
### Resources
[Developer documentation](https://wiki.dolibarr.org/index.php/Developer_documentation)
Translations
------------
The source language (en_US) is maintained in the repository. See the [Code](#code) section above.
All other translations are managed online at [Transifex](https://www.transifex.com/dolibarr-association/dolibarr/).
Translations done on transifex are available in the next major release.
Note: Sometimes, the source text (English) is modified. In such a case, the translation is reset. Transifex assume that if the original source
has changed, the translation is surely no more correct so must be done again. But old translation is not lost and you can use the tab "History"
to retrieve all old translation of a source text, and restore the translation in one click with no need to retranslate it if there is no need to.
### Resources
[Translator documentation](https://wiki.dolibarr.org/index.php/Translator_documentation)
Documentation
-------------
The project's documentation is maintained on the [Wiki](https://wiki.dolibarr.org/index.php).
*Note*: to help prevent spam, you need to create an account before being able to edit. Everybody is welcome to contribute to its content.

5
.github/FUNDING.yml vendored
View File

@@ -1,5 +0,0 @@
# These are supported funding model platforms
open_collective: dolibarr
custom: https://wiki.dolibarr.org/index.php/Subscribe
github: [eldy]

View File

@@ -1,48 +0,0 @@
name: Bug report
description: Create a report to help us fix something that is broken
labels: ["Bug"]
body:
- type: markdown
attributes:
value: |
This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.
- type: textarea
id: bug
attributes:
label: Bug
description: Please give a short description of the bug
validations:
required: true
- type: input
id: environment-version
attributes:
label: Dolibarr Version
description: Affected Dolibarr version(s)
placeholder: 19.0, develop, ...
- type: input
id: environment-php
attributes:
label: Environment PHP
description: PHP version
- type: input
id: environment-database
attributes:
label: Environment Database
description: Database type and version
- type: textarea
id: reproduce
attributes:
label: Steps to reproduce the behavior and expected behavior
description: Verbose description
- type: textarea
id: files
attributes:
label: Attached files
description: Screenshots, screencasts, dolibarr.log, debugging information

View File

@@ -1,35 +0,0 @@
name: Feature request
description: Suggest a new idea for this project
labels: ["Feature request"]
body:
- type: markdown
attributes:
value: |
This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.
- type: textarea
id: feature-request
attributes:
label: Feature Request
description: Short description
validations:
required: true
- type: textarea
id: use-case
attributes:
label: Use case
description: Verbose description
- type: textarea
id: suggested-implementation
attributes:
label: Suggested implementation
description: Verbose description
- type: textarea
id: suggested-steps
attributes:
label: Suggested steps
description: List of tasks to achieve goal

View File

@@ -1,27 +0,0 @@
# Instructions
*This is a template to help you make good pull requests. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*
*Please:*
- *only keep the "FIX", "CLOSE", "NEW", "PERF" or "QUAL" section* (use uppercase to have the PR appears into the ChangeLog, lowercase will not appears)
- *follow the project [contributing guidelines](/.github/CONTRIBUTING.md)*
- *replace the bracket enclosed texts with meaningful information*
# FIX|Fix #[*issue_number Short description*]
[*Long description*]
# CLOSE|Close #[*issue_number Short description*]
[*Long description*]
# NEW|New [*Short description*]
[*Long description*]
# PERF|Perf #[*issue_number Short description*]
[*Long description*]
# QUAL|Qual #[*issue_number Short description*]
[*Long description*]

View File

@@ -1,6 +0,0 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"

View File

@@ -1,16 +0,0 @@
# Workflow run order
To reduce run minutes, the following order is put in place:
On PR & Merge, always run:
- pre-commit;
- phan.
When both succeed, start:
- phpstan;
- Windows-ci;
- travis.
See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#running-a-workflow-based-on-the-conclusion-of-another-workflow

View File

@@ -1,36 +0,0 @@
---
name: Cleanup caches of a closed branch
# See https://github.com/actions/cache/blob/main/tips-and-workarounds.md#force-deletion-of-caches-overriding-default-cache-eviction-policy
on:
pull_request:
types: [closed]
workflow_dispatch:
jobs:
cleanup:
runs-on: ubuntu-latest
permissions:
# `actions:write` permission is required to delete caches
# See also: https://docs.github.com/en/rest/actions/cache?apiVersion=2022-11-28#delete-a-github-actions-cache-for-a-repository-using-a-cache-id
actions: write
contents: read
steps:
- name: Check out code
uses: actions/checkout@v4
- name: Cleanup
run: |
gh extension install actions/gh-actions-cache
REPO=${{ github.repository }}
BRANCH=refs/pull/${{ github.event.pull_request.number }}/merge
echo "Fetching list of cache key"
cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH | cut -f 1 )
## Setting this to not fail the workflow while deleting cache keys.
set +e
echo "Deleting caches..."
for cacheKey in $cacheKeysForPR
do
gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm
done
echo "Done"
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

View File

@@ -1,40 +0,0 @@
name: "CI-PULL-REQUEST"
on: [pull_request]
jobs:
pre-commit:
uses: ./.github/workflows/pre-commit.yml
secrets: inherit
with:
gh_event: ${{ github.event_name }}
phan:
uses: ./.github/workflows/phan.yml
secrets: inherit
needs: [pre-commit]
with:
gh_event: ${{ github.event_name }}
phpstan:
uses: ./.github/workflows/phpstan.yml
secrets: inherit
needs: [pre-commit, phan]
with:
gh_event: ${{ github.event_name }}
#windows-ci:
# needs: [pre-commit, phan, phpstan]
# secrets: inherit
# uses: ./.github/workflows/windows-ci.yml
# with:
# gh_event: ${{ github.event_name }}
gh-travis: # Runs travis script on github runner (not on travis)
if: false
# needs: [pre-commit, phan]
# needs: [windows-ci]
secrets: inherit
uses: ./.github/workflows/gh-travis.yml
with:
gh_event: ${{ github.event_name }}
# Note (not tested, from https://github.com/orgs/community/discussions/38361)
# To cancel jobs if one failes, the following action may help
# - if: "failure()"
# uses: "andymckay/cancel-action@0.3"

View File

@@ -1,40 +0,0 @@
name: "CI-PUSH"
on: [push]
jobs:
pre-commit:
uses: ./.github/workflows/pre-commit.yml
secrets: inherit
with:
gh_event: ${{ github.event_name }}
phan:
uses: ./.github/workflows/phan.yml
secrets: inherit
needs: [pre-commit]
with:
gh_event: ${{ github.event_name }}
phpstan:
uses: ./.github/workflows/phpstan.yml
secrets: inherit
needs: [pre-commit, phan]
with:
gh_event: ${{ github.event_name }}
windows-ci:
needs: [pre-commit, phan, phpstan]
secrets: inherit
uses: ./.github/workflows/windows-ci.yml
with:
gh_event: ${{ github.event_name }}
gh-travis: # Runs travis script on github runner (not on travis)
if: false
# needs: [pre-commit, phan]
# needs: [windows-ci]
secrets: inherit
uses: ./.github/workflows/gh-travis.yml
with:
gh_event: ${{ github.event_name }}
# Note (not tested, from https://github.com/orgs/community/discussions/38361)
# To cancel jobs if one failes, the following action may help
# - if: "failure()"
# uses: "andymckay/cancel-action@0.3"

View File

@@ -1,28 +0,0 @@
name: Qodana
on:
schedule:
- cron: "0 20 * * 1,3,5"
workflow_dispatch:
branches:
- develop
# push:
# branches:
# - develop
permissions:
contents: read
jobs:
qodana:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 1
#php-version: '7.1'
- name: 'Qodana Scan'
uses: JetBrains/qodana-action@v2023.2.1
#with:
# php-version: '7.1'
env:
QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}

View File

@@ -1,38 +0,0 @@
# See syntax file on https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
name: Doxygen
on:
schedule:
- cron: "0 15 * * *"
workflow_dispatch:
branches:
- develop
permissions:
contents: write
jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Build
uses: DenverCoder1/doxygen-github-pages-action@v1.2.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
branch: gh-pages
folder: build/html
config_file: build/doxygen/dolibarr-doxygen.doxyfile
# - name: Deploy
# uses: JamesIves/github-pages-deploy-action@v4
# with:
# branch: gh-pages
# folder: build/html # The folder the action should deploy.
# target-folder: docs/html2
#jobs:
# doxygen:
# runs-on: ubuntu-latest
# steps:
# - name: 'Doxygen'
# uses: mattnotmitt/doxygen-action@1.9.5
# with:
# doxyfile-path: build/doxygen

View File

@@ -1,28 +0,0 @@
# See syntax file on https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
name: "Exakat analysis"
on:
# execute once a month, the 1st
schedule:
- cron: "0 20 1 * *"
workflow_dispatch:
branches:
- develop
permissions:
contents: read
jobs:
exakat:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Exakat
uses: docker://exakat/exakat-ga
with:
ignore_rules: 'Classes/UseInstanceof,Constants/ConstantStrangeNames,Performances/PrePostIncrement,Functions/UndefinedFunctions,Functions/WrongNumberOfArguments,Functions/WrongTypeWithCall,Variables/UndefinedVariable,Classes/DontUnsetProperties,Classes/NonPpp,Classes/StaticMethodsCalledFromObject,Classes/UseClassOperator,Functions/UsesDefaultArguments,Php/NoClassInGlobal,Php/ShouldUseCoalesce,Php/WrongTypeForNativeFunction,Structures/AddZero,Structures/DropElseAfterReturn,Structures/IfWithSameConditions,Structures/MergeIfThen,Structures/NestedTernary,Structures/ElseIfElseif,Structures/ExitUsage,Structures/RepeatedPrint,Structures/RepeatedRegex,Structures/SameConditions,Structures/SwitchWithoutDefault,Structures/ShouldMakeTernary,Structures/UselessParenthesis,Structures/UseConstant'
ignore_dirs: '/htdocs/includes/,/htdocs/install/doctemplates/,/build/,/dev/,/doc/,/scripts/,/test/'
file_extensions: php
project_reports: Perfile

View File

@@ -1,49 +0,0 @@
---
# This runs a travis script inside a github runner
name: Travis
# Controls when the workflow will run
on:
# workflow called by the parent workflow ci.yml
workflow_call:
inputs:
gh_event:
required: true
type: string
# can run job manually
workflow_dispatch:
concurrency:
group: travis-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref
}}
cancel-in-progress: true
env:
gh_event: ${{ inputs.gh_event || github.event_name }}
GITHUB_JSON: ${{ toJSON(github) }} # Helps in debugging Github Action
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job
gh-travis:
# The type of runner that the job will run on
runs-on: ubuntu-latest
strategy:
fail-fast: false
# matrix:
# php-version:
# # PHPStan requires PHP >= 7.2.
# #- "7.2"
# - "8.2"
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- name: Checkout travis file
uses: actions/checkout@v4
- name: Run .travis.yml build script
uses: ktomk/run-travis-yml@v1
with:
# run-job: travis # name of a job in travis file
allow-failure: false
# file: .travis.yml
# steps: | # Default: setup, before_install, install, before_script, script, after_script, before_deploy
# install
# script
# env:
# TRAVIS_PHP_VERSION: ${{ matrix.php-version }}

View File

@@ -1,365 +0,0 @@
name: GitHub CI PHP 7.1 Postgres
on:
push:
branches:
- develop
- 1*
- 2*
pull_request:
types: [opened]
permissions:
contents: read
jobs:
github_ci_php71_pgsql:
runs-on: ubuntu-latest
services:
mysql:
image: mysql:5.7
env:
MYSQL_ROOT_PASSWORD: password
ports:
- 32574:3306
postgres:
image: postgres
env:
POSTGRES_PASSWORD: postgres
POSTGRES_USER: postgres
POSTGRES_DB: postgres
# Set health checks to wait until postgres has started
options: >-
--health-cmd pg_isready
--health-interval 10s
--health-timeout 5s
--health-retries 5
ports:
- 5432:5432
steps:
# git clone dolibarr into GITHUB_WORKSPACE = /home/runner/work/dolibarr/dolibarr
- uses: actions/checkout@v3
with:
fetch-depth: 1
- name: Version PHP
run: |
php -i | head -
- name: Install packages for PHP 7.1
run: |
sudo composer self-update 2.2.18
sudo chmod -R a+rwx /home/runner
composer -n config -g vendor-dir htdocs/includes
sudo add-apt-repository -y ppa:ondrej/php
sudo apt-get update
sudo apt-get install -y pgloader memcached
sudo apt install apache2 php7.1 php7.1-cli php7.1-curl php7.1-mysql php7.1-pgsql php7.1-gd php7.1-imap php7.1-intl php7.1-ldap php7.1-xml php7.1-mbstring php7.1-xml php7.1-zip libapache2-mod-php7.1
sudo update-alternatives --set php /usr/bin/php7.1
php -i | head -
cd $GITHUB_WORKSPACE
ls $GITHUB_WORKSPACE
composer -n require --ignore-platform-reqs phpunit/phpunit ^7.5 \
php-parallel-lint/php-parallel-lint ^1 \
php-parallel-lint/php-console-highlighter ^0 \
php-parallel-lint/php-var-dump-check ~0.4 \
squizlabs/php_codesniffer ^3
#For php7.3
#composer -n require phpunit/phpunit ^7.5 \
# php-parallel-lint/php-parallel-lint ^1.2 \
# php-parallel-lint/php-console-highlighter ^0 \
# php-parallel-lint/php-var-dump-check ~0.4 \
# squizlabs/php_codesniffer ^3
sudo rm -fr htdocs/includes/phpunit/php-code-coverage/src/Report/Html
- name: Adding path of binaries tools installed by composer to the PATH
run: |
export PATH="$GITHUB_WORKSPACE/htdocs/includes/bin:$PATH"
echo $PATH
# We must have a directory bin created by the previous composer call
ls $GITHUB_WORKSPACE/htdocs/includes/bin
- name: Version information
run: |
composer -V
# Check Parallel-lint version
echo "Parallel-lint version"
htdocs/includes/bin/parallel-lint -V
# Check PHP CodeSniffer version
echo "PHPCS version"
htdocs/includes/bin/phpcs --version | head -
htdocs/includes/bin/phpcs -i | head -
# Check PHP Vardump check version
echo "PHP Vardump check version"
htdocs/includes/bin/var-dump-check --version
# Check PHPUnit version
echo "PHPUnit version"
htdocs/includes/bin/phpunit --version | head -
# Check Apache version
echo "Apache version"
apache2 -v | head -
# Check Database
echo "Database version"
mysql --version | head -
psql --version
echo "Check pgloader version"
pgloader --version
- name: Create database
run: |
pwd
echo GITHUB_WORKSPACE = $GITHUB_WORKSPACE
sudo apt-get install -y mysql-client
mysql --version | head -
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "SELECT VERSION();" | head -
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "SHOW DATABASES"
echo "Drop and create database"
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'DROP DATABASE IF EXISTS travis;'
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "CREATE DATABASE IF NOT EXISTS travis CHARACTER SET = 'utf8';"
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "CREATE USER 'travis'@'127.0.0.1' IDENTIFIED BY 'password';"
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;'
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'FLUSH PRIVILEGES;'
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis -e "UPDATE llx_const set value = '0666' WHERE name = 'MAIN_UMASK';"
echo "Init postgresql database"
ps fauxww | grep postgres
ls /etc/postgresql/14/main/
sudo chmod -R a+rwx /etc/postgresql/14/main/pg_hba.conf
sudo sed -i -e '/local.*peer/s/postgres/all/' -e 's/peer\|md5/trust/g' /etc/postgresql/14/main/pg_hba.conf
sudo cat /etc/postgresql/14/main/pg_hba.conf
sudo /etc/init.d/postgresql restart
psql postgresql://postgres:postgres@127.0.0.1:5432 -l -A
psql postgresql://postgres:postgres@127.0.0.1:5432 -c 'create database travis;'
sudo mkdir -p /tmp/pgloader
sudo chmod -R a+rwx /tmp/pgloader/
echo sudo pgloader mysql://root:password@127.0.0.1:32574/travis postgresql://postgres:postgres@127.0.0.1:5432/travis
sudo pgloader mysql://root:password@127.0.0.1:32574/travis postgresql://postgres:postgres@127.0.0.1:5432/travis
echo 'ALTER SEQUENCE llx_accountingaccount_rowid_seq RENAME TO llx_accounting_account_rowid_seq' | psql postgresql://postgres:postgres@127.0.0.1:5432/travis
echo 'ALTER SEQUENCE llx_accounting_account_rowid_seq RESTART WITH 1000001;' | psql postgresql://postgres:postgres@127.0.0.1:5432/travis
# Create pgsql compatibility functions
psql postgresql://postgres:postgres@127.0.0.1:5432/travis < htdocs/install/pgsql/functions/functions.sql
- name: Generate Dolibarr conf file
run: |
export CONF_FILE=$GITHUB_WORKSPACE/htdocs/conf/conf.php
echo "Setting up Dolibarr $CONF_FILE"
echo '<?php' > $CONF_FILE
echo '$'dolibarr_main_url_root=\'http://127.0.0.1\'';' >> $CONF_FILE
echo '$'dolibarr_main_document_root=\'/var/www/html\'';' >> $CONF_FILE
echo '$'dolibarr_main_data_root=\'/var/www/html/documents\'';' >> $CONF_FILE
echo '$'dolibarr_main_db_host=\'127.0.0.1\'';' >> $CONF_FILE
echo '$'dolibarr_main_db_name=\'travis\'';' >> $CONF_FILE
echo '$'dolibarr_main_db_user=\'postgres\'';' >> $CONF_FILE
echo '$'dolibarr_main_db_pass=\'postgres\'';' >> $CONF_FILE
echo '$'dolibarr_main_instance_unique_id=\'travis1234567890\'';' >> $CONF_FILE
echo '$'dolibarr_main_db_type=\'pgsql\'';' >> $CONF_FILE
echo '$'dolibarr_main_db_port=\'5432\'';' >> $CONF_FILE
echo '$'dolibarr_main_authentication=\'dolibarr\'';' >> $CONF_FILE
cat $CONF_FILE
- name: Generate install.forced.php file to test installation
run: |
export INSTALL_FORCED_FILE=$GITHUB_WORKSPACE/htdocs/install/install.forced.php
echo "Setting up Dolibarr $INSTALL_FORCED_FILE to test installation"
# Ensure we catch errors
set +e
echo '<?php' > $INSTALL_FORCED_FILE
echo '$'force_install_noedit=2';' >> $INSTALL_FORCED_FILE
echo '$'force_install_type=\'pgsql\'';' >> $INSTALL_FORCED_FILE
echo '$'force_install_dbserver=\'127.0.0.1\'';' >> $INSTALL_FORCED_FILE
echo '$'force_install_database=\'travis\'';' >> $INSTALL_FORCED_FILE
echo '$'force_install_databaselogin=\'postgres\'';' >> $INSTALL_FORCED_FILE
echo '$'force_install_databasepass=\'postgres\'';' >> $INSTALL_FORCED_FILE
echo '$'force_install_port=\'5432\'';' >> $INSTALL_FORCED_FILE
echo '$'force_install_prefix=\'llx_\'';' >> $INSTALL_FORCED_FILE
echo '$'force_install_createdatabase=false';' >> $INSTALL_FORCED_FILE
echo '$'force_install_createuser=false';' >> $INSTALL_FORCED_FILE
echo '$'force_install_mainforcehttps=false';' >> $INSTALL_FORCED_FILE
echo '$'force_install_main_data_root=\'/var/www/html\'';' >> $INSTALL_FORCED_FILE
cat $INSTALL_FORCED_FILE
- name: Create document directory
run: |
echo "Create documents directory and set permissions"
# and admin/temp subdirectory needed for unit tests
sudo mkdir -p /var/www/html/documents/admin/temp
sudo chmod -R a+rwx /var/www/html/documents
sudo echo "***** First line of dolibarr.log" > /var/www/html/documents/dolibarr.log
sudo chmod a+rwx /var/www/html/documents/dolibarr.log
- name: Copy app into /var/www
run: |
sudo cp -r $GITHUB_WORKSPACE/htdocs/. /var/www/html
sudo mv /var/www/html/index.html /var/www/html/index.disabled.html
sudo ln -fs /var/www/html /var/www/htdocs
sudo cp -r $GITHUB_WORKSPACE/test/. /var/www/test
sudo cp -r $GITHUB_WORKSPACE/dev/. /var/www/dev
sudo cp -r $GITHUB_WORKSPACE/scripts/. /var/www/scripts
- name: Setup Apache
run: |
pwd
whoami
# install apache web server
a2query -s
a2query -m
ls /etc/apache2/sites-available
#sudo cp -f $GITHUB_WORKSPACE/build/travis-ci/apache-githubaction.conf /etc/apache2/sites-available/000-default.conf
#sudo sed -e "s?%GITHUB_WORKSPACE%?$(pwd)?g" --in-place /etc/apache2/sites-available/000-default.conf
a2ensite 000-default
a2enmod php7.1
ls /etc/apache2/sites-enabled
sudo adduser $(whoami) www-data
sudo adduser $(whoami) root
sudo adduser root www-data
sudo chown -R www-data:www-data /etc/apache2/sites-available/
sudo chmod -R 777 /etc/apache2/sites-available/
sudo chown -R www-data:www-data /var/www/html/
ls -l /var/www/html
#ls -l /var/www/html/conf
#ls -l /var/www/html/install/
set +e
sudo cat /etc/apache2/sites-enabled/000-default.conf
sudo service apache2 restart
curl -I localhost
- name: Check Apache availability
run: |
echo "Checking webserver availability by a wget -O - --debug http://127.0.0.1"
# Ensure we stop on error with set -e
set +e
ls /var/log/apache2
#wget -O - --debug http://127.0.0.1/robots.txt
# The wget should return a page with line '<meta name="generator" content="Dolibarr installer">
wget -O - --debug http://127.0.0.1 > $GITHUB_WORKSPACE/test.html 2>&1
head -n 200 $GITHUB_WORKSPACE/test.html
echo Logs are...
#sudo cat /tmp/install.log
sudo cat /var/log/apache2/access.log
sudo cat /var/log/apache2/error.log
sudo cat /var/log/apache2/other_vhosts_access.log
set +e
- name: Upgrading Dolibarr
run: |
# Ensure we catch errors. Set this to +e if you want to go to the end to see log files.
set -e
sudo chmod -R a+rwx $GITHUB_WORKSPACE
sudo chmod -R a+rwx /var/www
ls -l /var/www
cd /var/www/html/install
echo Execute upgrade, upgrade2 and step5 for each major version
php upgrade.php 3.5.0 3.6.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade350360.log
php upgrade2.php 3.5.0 3.6.0 > $GITHUB_WORKSPACE/upgrade350360-2.log
php step5.php 3.5.0 3.6.0 > $GITHUB_WORKSPACE/upgrade350360-3.log
php upgrade.php 3.6.0 3.7.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade360370.log
php upgrade2.php 3.6.0 3.7.0 > $GITHUB_WORKSPACE/upgrade360370-2.log
php step5.php 3.6.0 3.7.0 > $GITHUB_WORKSPACE/upgrade360370-3.log
php upgrade.php 3.7.0 3.8.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade370380.log
php upgrade2.php 3.7.0 3.8.0 > $GITHUB_WORKSPACE/upgrade370380-2.log
php step5.php 3.7.0 3.8.0 > $GITHUB_WORKSPACE/upgrade370380-3.log
php upgrade.php 3.8.0 3.9.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade380390.log
php upgrade2.php 3.8.0 3.9.0 > $GITHUB_WORKSPACE/upgrade380390-2.log
php step5.php 3.8.0 3.9.0 > $GITHUB_WORKSPACE/upgrade380390-3.log
php upgrade.php 3.9.0 4.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade390400.log
php upgrade2.php 3.9.0 4.0.0 > $GITHUB_WORKSPACE/upgrade390400-2.log
php step5.php 3.9.0 4.0.0 > $GITHUB_WORKSPACE/upgrade390400-3.log
php upgrade.php 4.0.0 5.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade400500.log
php upgrade2.php 4.0.0 5.0.0 > $GITHUB_WORKSPACE/upgrade400500-2.log
php step5.php 4.0.0 5.0.0 > $GITHUB_WORKSPACE/upgrade400500-3.log
php upgrade.php 5.0.0 6.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade500600.log
php upgrade2.php 5.0.0 6.0.0 > $GITHUB_WORKSPACE/upgrade500600-2.log
php step5.php 5.0.0 6.0.0 > $GITHUB_WORKSPACE/upgrade500600-3.log
php upgrade.php 6.0.0 7.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade600700.log
php upgrade2.php 6.0.0 7.0.0 > $GITHUB_WORKSPACE/upgrade600700-2.log
php step5.php 6.0.0 7.0.0 > $GITHUB_WORKSPACE/upgrade600700-3.log
echo "\dt llx_c_paiement" | psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis'
echo "\dt llx_c_payment_term" | psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis'
php upgrade.php 7.0.0 8.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade700800.log
php upgrade2.php 7.0.0 8.0.0 > $GITHUB_WORKSPACE/upgrade700800-2.log
php step5.php 7.0.0 8.0.0 > $GITHUB_WORKSPACE/upgrade700800-3.log
php upgrade.php 8.0.0 9.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade800900.log
php upgrade2.php 8.0.0 9.0.0 > $GITHUB_WORKSPACE/upgrade800900-2.log
php step5.php 8.0.0 9.0.0 > $GITHUB_WORKSPACE/upgrade800900-3.log
php upgrade.php 9.0.0 10.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade9001000.log
php upgrade2.php 9.0.0 10.0.0 > $GITHUB_WORKSPACE/upgrade9001000-2.log
php step5.php 9.0.0 10.0.0 > $GITHUB_WORKSPACE/upgrade9001000-3.log
php upgrade.php 10.0.0 11.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade10001100.log
php upgrade2.php 10.0.0 11.0.0 > $GITHUB_WORKSPACE/upgrade10001100-2.log
php step5.php 10.0.0 11.0.0 > $GITHUB_WORKSPACE/upgrade10001100-3.log
php upgrade.php 11.0.0 12.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade11001200.log
php upgrade2.php 11.0.0 12.0.0 > $GITHUB_WORKSPACE/upgrade11001200-2.log
php step5.php 11.0.0 12.0.0 > $GITHUB_WORKSPACE/upgrade11001200-3.log
php upgrade.php 12.0.0 13.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade12001300.log
php upgrade2.php 12.0.0 13.0.0 > $GITHUB_WORKSPACE/upgrade12001300-2.log
php step5.php 12.0.0 13.0.0 > $GITHUB_WORKSPACE/upgrade12001300-3.log
php upgrade.php 13.0.0 14.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade13001400.log
php upgrade2.php 13.0.0 14.0.0 > $GITHUB_WORKSPACE/upgrade13001400-2.log
php step5.php 13.0.0 14.0.0 > $GITHUB_WORKSPACE/upgrade13001400-3.log
php upgrade.php 14.0.0 15.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade14001500.log
php upgrade2.php 14.0.0 15.0.0 > $GITHUB_WORKSPACE/upgrade14001500-2.log
php step5.php 14.0.0 15.0.0 > $GITHUB_WORKSPACE/upgrade14001500-3.log
php upgrade.php 15.0.0 16.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade15001600.log
php upgrade2.php 15.0.0 16.0.0 > $GITHUB_WORKSPACE/upgrade15001600-2.log
php step5.php 15.0.0 16.0.0 > $GITHUB_WORKSPACE/upgrade15001600-3.log
php upgrade.php 16.0.0 17.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade16001700.log
php upgrade2.php 16.0.0 17.0.0 > $GITHUB_WORKSPACE/upgrade16001700-2.log
php step5.php 16.0.0 17.0.0 > $GITHUB_WORKSPACE/upgrade16001700-3.log
php upgrade.php 17.0.0 18.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade17001800.log
php upgrade2.php 17.0.0 18.0.0 > $GITHUB_WORKSPACE/upgrade17001800-2.log
php step5.php 17.0.0 18.0.0 > $GITHUB_WORKSPACE/upgrade17001800-3.log
- name: Result of migration scripts
if: always()
run: |
ls -alrt $GITHUB_WORKSPACE/
echo Show content of last file
cat "$(ls -rt $GITHUB_WORKSPACE/ | tail -n1)"
- name: Enabling new modules
run: |
# Enable modules not enabled into original dump
set -e
cd /var/www/html/install
php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_ProductBatch,MAIN_MODULE_SupplierProposal,MAIN_MODULE_STRIPE,MAIN_MODULE_ExpenseReport > $GITHUB_WORKSPACE/enablemodule.log
php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKET,MAIN_MODULE_ACCOUNTING,MAIN_MODULE_MRP >> $GITHUB_WORKSPACE/enablemodule.log
php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_RECEPTION,MAIN_MODULE_RECRUITMENT >> $GITHUB_WORKSPACE/enablemodule.log
php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_KnowledgeManagement,MAIN_MODULE_EventOrganization,MAIN_MODULE_PARTNERSHIP >> $GITHUB_WORKSPACE/enablemodule.log
php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_EmailCollector >> $GITHUB_WORKSPACE/enablemodule.log
echo $?
cd -
- name: Result of enabling modules scripts
if: always()
run: |
echo Show content of enablemodule.log file
cat $GITHUB_WORKSPACE/enablemodule.log
- name: Unit testing
run: |
# Ensure we catch errors. Set this to +e instead of -e if you want to go to the end to see dolibarr.log file.
set -e
cd /var/www/html
sudo chmod -R a+rwx /var/www/html/documents
includes/bin/phpunit -d memory_limit=-1 -c /var/www/test/phpunit/phpunittest.xml /var/www/test/phpunit/AllTests.php
phpunitresult=$?
echo "Phpunit return code = $phpunitresult"
set +e

View File

@@ -1,334 +0,0 @@
name: GitHub CI PHP 8.1 MySQL
on:
push:
branches:
- develop
- 1*
- 2*
pull_request:
types: [opened]
permissions:
contents: read
jobs:
github_ci_php81_mysql:
runs-on: ubuntu-latest
services:
mysql:
image: mysql:5.7
env:
MYSQL_ROOT_PASSWORD: password
ports:
- 32574:3306
steps:
# git clone dolibarr into GITHUB_WORKSPACE = /home/runner/work/dolibarr/dolibarr
- uses: actions/checkout@v3
with:
fetch-depth: 1
- name: Version PHP
run: |
php -i | head -
- name: Install packages for PHP 8.1
run: |
sudo composer self-update 2.2.18
sudo chmod -R a+rwx /home/runner
composer -n config -g vendor-dir htdocs/includes
sudo add-apt-repository -y ppa:ondrej/php
sudo apt-get update
sudo apt-get install -y pgloader memcached
sudo apt install apache2 php8.1 php8.1-cli php8.1-curl php8.1-mysql php8.1-pgsql php8.1-gd php8.1-imap php8.1-intl php8.1-ldap php8.1-xml php8.1-mbstring php8.1-xml php8.1-zip libapache2-mod-php8.1
sudo update-alternatives --set php /usr/bin/php8.1
php -i | head -
cd $GITHUB_WORKSPACE
ls $GITHUB_WORKSPACE
composer -n require --ignore-platform-reqs phpunit/phpunit ^8 \
php-parallel-lint/php-parallel-lint ^1.2 \
php-parallel-lint/php-console-highlighter ^0 \
php-parallel-lint/php-var-dump-check ~0.4 \
squizlabs/php_codesniffer ^3
sudo rm -fr htdocs/includes/phpunit/php-code-coverage/src/Report/Html
- name: Adding path of binaries tools installed by composer to the PATH
run: |
export PATH="$GITHUB_WORKSPACE/htdocs/includes/bin:$PATH"
echo $PATH
# We must have a directory bin created by the previous composer call
ls $GITHUB_WORKSPACE/htdocs/includes/bin
- name: Version information
run: |
composer -V
# Check Parallel-lint version
echo "Parallel-lint version"
htdocs/includes/bin/parallel-lint -V
# Check PHP CodeSniffer version
echo "PHPCS version"
htdocs/includes/bin/phpcs --version | head -
htdocs/includes/bin/phpcs -i | head -
# Check PHP Vardump check version
echo "PHP Vardump check version"
htdocs/includes/bin/var-dump-check --version
# Check PHPUnit version
echo "PHPUnit version"
htdocs/includes/bin/phpunit --version | head -
# Check Apache version
echo "Apache version"
apache2 -v | head -
# Check Database
echo "Database version"
mysql --version | head -
psql --version
echo "Check pgloader version"
pgloader --version
- name: Create database
run: |
pwd
echo GITHUB_WORKSPACE = $GITHUB_WORKSPACE
sudo apt-get install -y mysql-client
mysql --version | head -
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "SELECT VERSION();" | head -
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "SHOW DATABASES"
echo "Drop and create database"
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'DROP DATABASE IF EXISTS travis;'
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "CREATE DATABASE IF NOT EXISTS travis CHARACTER SET = 'utf8';"
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "CREATE USER 'travis'@'127.0.0.1' IDENTIFIED BY 'password';"
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;'
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'FLUSH PRIVILEGES;'
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis -e "UPDATE llx_const set value = '0666' WHERE name = 'MAIN_UMASK';"
- name: Generate Dolibarr conf file
run: |
export CONF_FILE=$GITHUB_WORKSPACE/htdocs/conf/conf.php
echo "Setting up Dolibarr $CONF_FILE"
echo '<?php' > $CONF_FILE
echo '$'dolibarr_main_url_root=\'http://127.0.0.1\'';' >> $CONF_FILE
echo '$'dolibarr_main_document_root=\'/var/www/html\'';' >> $CONF_FILE
echo '$'dolibarr_main_data_root=\'/var/www/html/documents\'';' >> $CONF_FILE
echo '$'dolibarr_main_db_host=\'127.0.0.1\'';' >> $CONF_FILE
echo '$'dolibarr_main_db_name=\'travis\'';' >> $CONF_FILE
echo '$'dolibarr_main_db_user=\'root\'';' >> $CONF_FILE
echo '$'dolibarr_main_db_pass=\'password\'';' >> $CONF_FILE
echo '$'dolibarr_main_instance_unique_id=\'travis1234567890\'';' >> $CONF_FILE
echo '$'dolibarr_main_db_type=\'mysqli\'';' >> $CONF_FILE
echo '$'dolibarr_main_db_port=\'32574\'';' >> $CONF_FILE
echo '$'dolibarr_main_authentication=\'dolibarr\'';' >> $CONF_FILE
cat $CONF_FILE
- name: Generate install.forced.php file to test installation
run: |
export INSTALL_FORCED_FILE=$GITHUB_WORKSPACE/htdocs/install/install.forced.php
echo "Setting up Dolibarr $INSTALL_FORCED_FILE to test installation"
# Ensure we catch errors
set +e
echo '<?php' > $INSTALL_FORCED_FILE
echo '$'force_install_noedit=2';' >> $INSTALL_FORCED_FILE
echo '$'force_install_type=\'mysqli\'';' >> $INSTALL_FORCED_FILE
echo '$'force_install_dbserver=\'127.0.0.1\'';' >> $INSTALL_FORCED_FILE
echo '$'force_install_database=\'travis\'';' >> $INSTALL_FORCED_FILE
echo '$'force_install_databaselogin=\'root\'';' >> $INSTALL_FORCED_FILE
echo '$'force_install_databasepass=\'password\'';' >> $INSTALL_FORCED_FILE
echo '$'force_install_port=\'32574\'';' >> $INSTALL_FORCED_FILE
echo '$'force_install_prefix=\'llx_\'';' >> $INSTALL_FORCED_FILE
echo '$'force_install_createdatabase=false';' >> $INSTALL_FORCED_FILE
echo '$'force_install_createuser=false';' >> $INSTALL_FORCED_FILE
echo '$'force_install_mainforcehttps=false';' >> $INSTALL_FORCED_FILE
echo '$'force_install_main_data_root=\'/var/www/html\'';' >> $INSTALL_FORCED_FILE
cat $INSTALL_FORCED_FILE
- name: Create document directory
run: |
echo "Create documents directory and set permissions"
# and admin/temp subdirectory needed for unit tests
sudo mkdir -p /var/www/html/documents/admin/temp
sudo chmod -R a+rwx /var/www/html/documents
sudo echo "***** First line of dolibarr.log" > /var/www/html/documents/dolibarr.log
sudo chmod a+rwx /var/www/html/documents/dolibarr.log
- name: Copy app into /var/www
run: |
sudo cp -r $GITHUB_WORKSPACE/htdocs/. /var/www/html
sudo mv /var/www/html/index.html /var/www/html/index.disabled.html
sudo ln -fs /var/www/html /var/www/htdocs
sudo cp -r $GITHUB_WORKSPACE/test/. /var/www/test
sudo cp -r $GITHUB_WORKSPACE/dev/. /var/www/dev
sudo cp -r $GITHUB_WORKSPACE/scripts/. /var/www/scripts
- name: Setup Apache
run: |
pwd
whoami
# install apache web server
a2query -s
a2query -m
ls /etc/apache2/sites-available
#sudo cp -f $GITHUB_WORKSPACE/build/travis-ci/apache-githubaction.conf /etc/apache2/sites-available/000-default.conf
#sudo sed -e "s?%GITHUB_WORKSPACE%?$(pwd)?g" --in-place /etc/apache2/sites-available/000-default.conf
a2ensite 000-default
a2enmod php8.1
ls /etc/apache2/sites-enabled
sudo adduser $(whoami) www-data
sudo adduser $(whoami) root
sudo adduser root www-data
sudo chown -R www-data:www-data /etc/apache2/sites-available/
sudo chmod -R 777 /etc/apache2/sites-available/
sudo chown -R www-data:www-data /var/www/html/
ls -l /var/www/html
#ls -l /var/www/html/conf
#ls -l /var/www/html/install/
set +e
sudo cat /etc/apache2/sites-enabled/000-default.conf
sudo service apache2 restart
curl -I localhost
- name: Check Apache availability
run: |
echo "Checking webserver availability by a wget -O - --debug http://127.0.0.1"
# Ensure we stop on error with set -e
set +e
ls /var/log/apache2
#wget -O - --debug http://127.0.0.1/robots.txt
# The wget should return a page with line '<meta name="generator" content="Dolibarr installer">
wget -O - --debug http://127.0.0.1 > $GITHUB_WORKSPACE/test.html 2>&1
head -n 200 $GITHUB_WORKSPACE/test.html
echo Logs are...
#sudo cat /tmp/install.log
sudo cat /var/log/apache2/access.log
sudo cat /var/log/apache2/error.log
sudo cat /var/log/apache2/other_vhosts_access.log
set +e
- name: Upgrading Dolibarr
run: |
# Ensure we catch errors. Set this to +e if you want to go to the end to see log files.
set -e
sudo chmod -R a+rwx $GITHUB_WORKSPACE
sudo chmod -R a+rwx /var/www
ls -l /var/www
cd /var/www/html/install
echo Execute upgrade, upgrade2 and step5 for each major version
php upgrade.php 3.5.0 3.6.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade350360.log
php upgrade2.php 3.5.0 3.6.0 > $GITHUB_WORKSPACE/upgrade350360-2.log
php step5.php 3.5.0 3.6.0 > $GITHUB_WORKSPACE/upgrade350360-3.log
php upgrade.php 3.6.0 3.7.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade360370.log
php upgrade2.php 3.6.0 3.7.0 > $GITHUB_WORKSPACE/upgrade360370-2.log
php step5.php 3.6.0 3.7.0 > $GITHUB_WORKSPACE/upgrade360370-3.log
php upgrade.php 3.7.0 3.8.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade370380.log
php upgrade2.php 3.7.0 3.8.0 > $GITHUB_WORKSPACE/upgrade370380-2.log
php step5.php 3.7.0 3.8.0 > $GITHUB_WORKSPACE/upgrade370380-3.log
php upgrade.php 3.8.0 3.9.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade380390.log
php upgrade2.php 3.8.0 3.9.0 > $GITHUB_WORKSPACE/upgrade380390-2.log
php step5.php 3.8.0 3.9.0 > $GITHUB_WORKSPACE/upgrade380390-3.log
php upgrade.php 3.9.0 4.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade390400.log
php upgrade2.php 3.9.0 4.0.0 > $GITHUB_WORKSPACE/upgrade390400-2.log
php step5.php 3.9.0 4.0.0 > $GITHUB_WORKSPACE/upgrade390400-3.log
php upgrade.php 4.0.0 5.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade400500.log
php upgrade2.php 4.0.0 5.0.0 > $GITHUB_WORKSPACE/upgrade400500-2.log
php step5.php 4.0.0 5.0.0 > $GITHUB_WORKSPACE/upgrade400500-3.log
php upgrade.php 5.0.0 6.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade500600.log
php upgrade2.php 5.0.0 6.0.0 > $GITHUB_WORKSPACE/upgrade500600-2.log
php step5.php 5.0.0 6.0.0 > $GITHUB_WORKSPACE/upgrade500600-3.log
php upgrade.php 6.0.0 7.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade600700.log
php upgrade2.php 6.0.0 7.0.0 > $GITHUB_WORKSPACE/upgrade600700-2.log
php step5.php 6.0.0 7.0.0 > $GITHUB_WORKSPACE/upgrade600700-3.log
php upgrade.php 7.0.0 8.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade700800.log
php upgrade2.php 7.0.0 8.0.0 > $GITHUB_WORKSPACE/upgrade700800-2.log
php step5.php 7.0.0 8.0.0 > $GITHUB_WORKSPACE/upgrade700800-3.log
php upgrade.php 8.0.0 9.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade800900.log
php upgrade2.php 8.0.0 9.0.0 > $GITHUB_WORKSPACE/upgrade800900-2.log
php step5.php 8.0.0 9.0.0 > $GITHUB_WORKSPACE/upgrade800900-3.log
php upgrade.php 9.0.0 10.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade9001000.log
php upgrade2.php 9.0.0 10.0.0 > $GITHUB_WORKSPACE/upgrade9001000-2.log
php step5.php 9.0.0 10.0.0 > $GITHUB_WORKSPACE/upgrade9001000-3.log
php upgrade.php 10.0.0 11.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade10001100.log
php upgrade2.php 10.0.0 11.0.0 > $GITHUB_WORKSPACE/upgrade10001100-2.log
php step5.php 10.0.0 11.0.0 > $GITHUB_WORKSPACE/upgrade10001100-3.log
php upgrade.php 11.0.0 12.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade11001200.log
php upgrade2.php 11.0.0 12.0.0 > $GITHUB_WORKSPACE/upgrade11001200-2.log
php step5.php 11.0.0 12.0.0 > $GITHUB_WORKSPACE/upgrade11001200-3.log
php upgrade.php 12.0.0 13.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade12001300.log
php upgrade2.php 12.0.0 13.0.0 > $GITHUB_WORKSPACE/upgrade12001300-2.log
php step5.php 12.0.0 13.0.0 > $GITHUB_WORKSPACE/upgrade12001300-3.log
php upgrade.php 13.0.0 14.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade13001400.log
php upgrade2.php 13.0.0 14.0.0 > $GITHUB_WORKSPACE/upgrade13001400-2.log
php step5.php 13.0.0 14.0.0 > $GITHUB_WORKSPACE/upgrade13001400-3.log
php upgrade.php 14.0.0 15.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade14001500.log
php upgrade2.php 14.0.0 15.0.0 > $GITHUB_WORKSPACE/upgrade14001500-2.log
php step5.php 14.0.0 15.0.0 > $GITHUB_WORKSPACE/upgrade14001500-3.log
php upgrade.php 15.0.0 16.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade15001600.log
php upgrade2.php 15.0.0 16.0.0 > $GITHUB_WORKSPACE/upgrade15001600-2.log
php step5.php 15.0.0 16.0.0 > $GITHUB_WORKSPACE/upgrade15001600-3.log
php upgrade.php 16.0.0 17.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade16001700.log
php upgrade2.php 16.0.0 17.0.0 > $GITHUB_WORKSPACE/upgrade16001700-2.log
php step5.php 16.0.0 17.0.0 > $GITHUB_WORKSPACE/upgrade16001700-3.log
php upgrade.php 17.0.0 18.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade17001800.log
php upgrade2.php 17.0.0 18.0.0 > $GITHUB_WORKSPACE/upgrade17001800-2.log
php step5.php 17.0.0 18.0.0 > $GITHUB_WORKSPACE/upgrade17001800-3.log
- name: Result of migration scripts
if: always()
run: |
ls -alrt $GITHUB_WORKSPACE/
echo Show content of last file
cat "$(ls -rt $GITHUB_WORKSPACE/ | tail -n1)"
- name: Enabling new modules
run: |
# Enable modules not enabled into original dump
set -e
cd /var/www/html/install
php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_ProductBatch,MAIN_MODULE_SupplierProposal,MAIN_MODULE_STRIPE,MAIN_MODULE_ExpenseReport > $GITHUB_WORKSPACE/enablemodule.log
php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKET,MAIN_MODULE_ACCOUNTING,MAIN_MODULE_MRP >> $GITHUB_WORKSPACE/enablemodule.log
php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_RECEPTION,MAIN_MODULE_RECRUITMENT >> $GITHUB_WORKSPACE/enablemodule.log
php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_KnowledgeManagement,MAIN_MODULE_EventOrganization,MAIN_MODULE_PARTNERSHIP >> $GITHUB_WORKSPACE/enablemodule.log
php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_EmailCollector >> $GITHUB_WORKSPACE/enablemodule.log
echo $?
cd -
- name: Result of enabling modules scripts
if: always()
run: |
echo Show content of enablemodule.log file
cat $GITHUB_WORKSPACE/enablemodule.log
- name: Unit testing
run: |
# Ensure we catch errors. Set this to +e instead of -e if you want to go to the end to see dolibarr.log file.
set -e
cd /var/www/html
sudo chmod -R a+rwx /var/www/html/documents
includes/bin/phpunit -d memory_limit=-1 -c /var/www/test/phpunit/phpunittest.xml /var/www/test/phpunit/AllTests.php
phpunitresult=$?
echo "Phpunit return code = $phpunitresult"
set +e
- name: Code quality check - Lint
if: github.event_name == 'push'
run: |
htdocs/includes/bin/parallel-lint -e php --exclude dev/tools/test/namespacemig --exclude htdocs/includes/composer --exclude htdocs/includes/myclabs --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes \
--exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian \
--exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/php-parallel-lint --exclude htdocs/includes/symfony \
--exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/maximebf \
--exclude htdocs/includes/phpunit/ --exclude htdocs/includes/tecnickcom/tcpdf/include/barcodes --exclude htdocs/includes/webmozart --exclude htdocs/includes/webklex --blame .
- name: Code quality check - phpcs
if: github.event_name == 'push'
run: |
htdocs/includes/bin/phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .;
- name: Code quality check - var-dump-check
if: github.event_name == 'push'
run: |
htdocs/includes/bin/var-dump-check --extensions php --tracy --exclude htdocs/includes --exclude test/ --exclude htdocs/public/test/ --exclude htdocs/core/lib/functions.lib.php .

View File

@@ -1,13 +0,0 @@
# See syntax file on https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
name: Greetings PR
on: [pull_request]
jobs:
greeting:
runs-on: ubuntu-latest
steps:
- uses: actions/first-interaction@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
pr-message: 'Welcome to the Dolibarr army. You are on the road to become an Admiral (see https://wiki.dolibarr.org/index.php/Dolibarr_Project)'

View File

@@ -1,55 +0,0 @@
---
on:
# workflow called by the parent workflow ci.yml
workflow_call:
inputs:
gh_event:
required: true
type: string
# can run job manually
workflow_dispatch:
concurrency:
group: phan-${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
env:
gh_event: ${{ inputs.gh_event || github.event_name }}
PHAN_CONFIG: >
${{ 'dev/tools/phan/config.php' }}
PHAN_BASELINE: dev/tools/phan/baseline.txt
PHAN_MIN_PHP: 7.0
PHAN_QUICK: ${{ github.event.schedule && '' || '--quick' }}
GITHUB_JSON: ${{ toJSON(github) }} # Helps in debugging Github Action
name: phan
jobs:
phan:
name: Run phan
runs-on: ubuntu-latest
# Do not run schedule on forks
if: |
github.repository == 'Dolibarr/dolibarr'
|| github.event.schedule == false
steps:
- uses: actions/checkout@v4
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.2
coverage: none # disable xdebug, pcov
tools: cs2pr,phan
- name: Run Phan analysis
run: |
phan $PHAN_QUICK -k $PHAN_CONFIG -B $PHAN_BASELINE --analyze-twice --minimum-target-php-version $PHAN_MIN_PHP --output-mode=checkstyle -o _phan.xml
- name: Add results to PR
if: ${{ always() }}
run: |
cs2pr --prepend-filename --prepend-source --notices-as-warnings _phan.xml
- name: Provide phan log as artifact
uses: actions/upload-artifact@v4
if: ${{ always() }}
with:
name: phan-srcrt
# path: ${{ github.workspace }}/phan.log
path: ${{ github.workspace }}/_phan.xml
retention-days: 2

View File

@@ -1,32 +0,0 @@
name: "PHPCS"
on:
push:
pull_request:
paths:
- "**.php"
- "phpcs.xml"
- ".github/workflows/phpcs.yml"
jobs:
phpcs:
runs-on: ubuntu-latest
steps:
# Get git sources
- uses: actions/checkout@v4
with:
fetch-depth: 50 # important!
# we may use whatever way to install phpcs, just specify the path on the next step
# however, curl seems to be the fastest
- name: Install PHP_CodeSniffer
run: |
curl -OL https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar
php phpcs.phar --version
- uses: thenabeel/action-phpcs@v8
with:
files: "**.php" # you may customize glob as needed
phpcs_path: php phpcs.phar
standard: dev/setup/codesniffer/ruleset.xml
fail_on_warnings: false

View File

@@ -1,87 +0,0 @@
---
# This is a basic workflow to check code with PHPSTAN tool
name: PHPStan
# Controls when the workflow will run
on:
# workflow called by the parent workflow ci.yml
workflow_call:
inputs:
gh_event:
required: true
type: string
# can run job manually
workflow_dispatch:
concurrency:
group: stan-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
env:
gh_event: ${{ inputs.gh_event || github.event_name }}
CACHE_KEY_PART: ${{ ( inputs.gh_event == 'pull_request' || github.event_name == 'pull_request' ) && format('{0}-{1}', github.base_ref, github.head_ref) || github.ref_name }}
GITHUB_JSON: ${{ toJSON(github) }} # Helps in debugging Github Action
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job
php-stan:
# The type of runner that the job will run on
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
php-version:
# PHPStan requires PHP >= 7.2.
#- "7.2"
- '8.2'
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v4
# Get PHP and addons
- name: Setup PHP
id: setup-php
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-version }}
tools: phpstan, cs2pr
extensions: calendar, json, imagick, gd, zip, mbstring, intl, opcache, imap,
mysql, pgsql, sqlite3, ldap, xml, mcrypt
# Restore old cache
- name: Restore phpstan cache
id: cache
uses: actions/cache/restore@v4
with:
path: ./.github/tmp
key: phpstan-cache-${{ matrix.php-version }}-${{ env.CACHE_KEY_PART }}-${{
github.run_id }}
restore-keys: |
phpstan-cache-${{ matrix.php-version }}-${{ env.CACHE_KEY_PART }}-
phpstan-cache-${{ matrix.php-version }}-${{ github.head_ref }}-
phpstan-cache-${{ matrix.php-version }}-${{ github.base_ref }}-
phpstan-cache-${{ matrix.php-version }}-
- name: Show debug into
run: cd ./.github/tmp && ls -al
# Run PHPStan
- name: Run PHPStan
id: phpstan
run: |
phpstan -vvv analyse --error-format=checkstyle --memory-limit 7G -a build/phpstan/bootstrap_action.php | tee _stan.xml | cs2pr --graceful-warnings
# continue-on-error: true
# Save cache
- name: Save phpstan cache
uses: actions/cache/save@v4
if: ${{ success() || ( ! cancelled() && steps.cache.outputs.cache-hit != 'true' ) }}
with:
path: ./.github/tmp
key: phpstan-cache-${{ matrix.php-version }}-${{ env.CACHE_KEY_PART }}-${{
github.run_id }}
- name: Provide phpstan log as artifact
uses: actions/upload-artifact@v4
if: ${{ always() }}
with:
name: phpstan-srcrt
path: ${{ github.workspace }}/_stan.xml
retention-days: 2

View File

@@ -1,144 +0,0 @@
---
name: pre-commit
on:
# workflow called by the parent workflow ci.yml
workflow_call:
inputs:
gh_event:
required: true
type: string
# can run job manually
workflow_dispatch:
concurrency:
group: pre-commit-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref
}}
cancel-in-progress: true
env:
gh_event: ${{ inputs.gh_event || github.event_name }}
jobs:
pre-commit:
runs-on: ubuntu-latest
env:
RAW_LOG: pre-commit.log
CS_XML: pre-commit.xml
steps:
- name: Install required tools
run: sudo apt-get update && sudo apt-get install cppcheck
if: false
# The next uses the git API because there is no clone yet.
# It sets the variable steps.changed-php.outputs.all_changed_files for other steps
# This is faster for a big repo.
- name: Get all changed php files (if PR)
id: changed-php
uses: tj-actions/changed-files@v44
if: env.gh_event == 'pull_request'
with:
files: |
**.php
# Checkout git sources to analyze
- uses: actions/checkout@v4
# Action setup-python needs a requirements.txt or pyproject.toml
# This ensures one of them exists.
- name: Create requirements.txt if no requirements.txt or pyproject.toml
run: |-
[ -r requirements.txt ] || [ -r pyproject.toml ] || touch requirements.txt
# Install python and pre-commit tool
- uses: actions/setup-python@v5
with:
cache: pip
python-version: "3.11"
- run: python -m pip install pre-commit
# Restore previous cache of precommit
- uses: actions/cache/restore@v4
with:
path: ~/.cache/pre-commit/
key: pre-commit-4|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }}
# Run all the precommit tools (defined in pre-commit-config.yaml).
# We can force exclusion of some of them here.
- name: Run pre-commit hooks
env:
# SKIP is used by pre-commit to not execute certain hooks
SKIP: no-commit-to-branch,php-cs,php-cbf,trailing-whitespace,end-of-file-fixer
run: |
set -o pipefail
pre-commit gc
pre-commit run --show-diff-on-failure --color=always --all-files | tee ${RAW_LOG}
# The next uses git, which is slow for a bit repo.
# - name: Get all changed php files (if PR)
# id: changed-php
# uses: tj-actions/changed-files@v44
# if: env.gh_event == 'pull_request'
# with:
# files: |
# **.php
- name: Setup PHPCS
uses: shivammathur/setup-php@v2
# Install when we're going to run phpcs
if: |
! cancelled() &&
(
steps.changed-php.outputs.any_changed == 'true'
||
(
env.gh_event == 'push'
&& (
github.event.ref == 'refs/heads/develop'
|| endsWith(github.event.ref, '.0')
)
)
)
with:
php-version: 8.1
coverage: none # disable xdebug, pcov
tools: phpcs
- name: Run some pre-commit hooks on selected changed files only
if: "! cancelled() && steps.changed-php.outputs.any_changed == 'true'"
env:
ALL_CHANGED_FILES: ${{ steps.changed-php.outputs.all_changed_files }}
run: |
set -o pipefail
pre-commit run php-cs --files ${ALL_CHANGED_FILES} | tee -a ${RAW_LOG}
- name: Run some pre-commit hooks on all files on push to "main" branches
if: |
env.gh_event == 'push'
&& (
github.event.ref == 'refs/heads/develop'
|| endsWith(github.event.ref, '.0')
)
run: |
set -o pipefail
ln -sf ~/.cache .cache # Absolute path in .pre-commit-config.yaml
pre-commit run --hook-stage manual -a php-cs-with-cache | tee -a ${RAW_LOG}
pre-commit run --hook-stage manual -a sqlfluff-lint | tee -a ${RAW_LOG}
ls -l ~/.cache/pre-commit/
- name: Convert Raw Log to Annotations
uses: mdeweerd/logToCheckStyle@v2024.3.5
if: ${{ failure() }}
with:
in: ${{ env.RAW_LOG }}
# Save the precommit cache
- uses: actions/cache/save@v4
if: ${{ ! cancelled() }}
with:
path: ~/.cache/pre-commit/
key: pre-commit-4|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }}
# Upload result log files of precommit into the Artifact shared store
- name: Provide log as artifact
uses: actions/upload-artifact@v4
if: ${{ ! cancelled() }}
with:
name: precommit-logs
path: |
${{ env.RAW_LOG }}
${{ env.CS_XML }}

View File

@@ -1,28 +0,0 @@
# See syntax file on https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
name: "Close stale issues (bugs and feature requests)"
on:
schedule:
- cron: "0 21 * * *"
issue_comment:
types: [created]
workflow_dispatch:
permissions: {} # none
jobs:
stale:
permissions:
issues: write
runs-on: ubuntu-latest
steps:
- uses: Dolibarr/stale@staleunstale
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-message: 'This issue is stale because it has been open 1 year with no activity. If this is a bug, please comment to confirm it is still present on latest stable version. if this is a feature request, please comment to notify the request is still relevant and not yet covered by latest stable version. This issue may be closed automatically by stale bot in 10 days (you should still be able to re-open it if required).'
stale-label: 'Issue Stale (automatic label)'
exempt-labels: 'Priority High / Blocking,Priority Top Strategic,Priority Medium,hacktoberfest,hacktoberfest-accepted,good first issue,Bug Security (CVE),Analysis of PR in progress'
days-before-stale: 365
days-before-close: 10
operations-per-run: 100
dry-run: false

View File

@@ -1,194 +0,0 @@
---
name: Win CI
# yamllint disable-line rule:truthy
on:
# workflow called by the parent workflow ci.yml
workflow_call:
inputs:
gh_event:
required: true
type: string
# can run job manually
workflow_dispatch:
concurrency:
group: win-ci-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref
}}
cancel-in-progress: true
env:
gh_event: ${{ inputs.gh_event || github.event_name }}
PHPUNIT_LOG: phpunit_tests.log
DOLIBARR_LOG: documents/dolibarr.log
PHPSERVER_LOG: phpserver.log
PHPSERVER_DOMAIN_PORT: 127.0.0.1:8000 # could be 127.0.0.1:8000 if config modified
CACHE_KEY_PART: ${{ ( inputs.gh_event == 'pull_request' || github.event_name == 'pull_request' ) && format('{0}-{1}', github.base_ref, github.head_ref) || github.ref_name }}
PHP_INI_SCAN_DIR: C:\myphpini
CKEY: win-ci-2
GITHUB_JSON: ${{ toJSON(github) }} # Helps in debugging Github Action
jobs:
win-test:
strategy:
matrix:
os: [windows-latest]
# php_version: [7.4, 8.0] # Add more versions if needed
php_version: [7.4] # Add more versions if needed
runs-on: ${{ matrix.os }}
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php_version }}
# ini-values: post_max_size=256M, max_execution_time=180
extensions: >
calendar, gd, imagick, imap, intl, json, ldap, mbstring,
mcrypt, mysql, mysqli, opcache, pgsql, sqlite3, xml, zip
tools: >
composer,
phpunit:9.5
coverage: none
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# phpts: ts # ts for thread-safe, default nts
# Restore cache
- name: Restore cache
id: cache
uses: actions/cache/restore@v4
env:
HASH: ${{ hashFiles('htdocs/install/**') }}
KEY_ROOT: ${{ matrix.os }}-${{ env.ckey }}-${{ matrix.php_version }}
with:
# See https://github.com/actions/cache/issues/1275#issuecomment-1925217178
enableCrossOsArchive: true
path: |
./db_init.sql
./db_init.sql.md5
./.cache/mariadb
key: ${{ env.KEY_ROOT }}-${{ env.HASH }}-${{ env.CACHE_KEY_PART }}-${{ github.run_id }}
restore-keys: |
${{ env.KEY_ROOT }}-${{ env.HASH }}-${{ env.CACHE_KEY_PART }}-
${{ env.KEY_ROOT }}-${{ env.HASH }}-${{ github.head_ref }}-
${{ env.KEY_ROOT }}-${{ env.HASH }}-${{ github.base_ref }}-
${{ env.KEY_ROOT }}-${{ env.HASH }}-
${{ env.KEY_ROOT }}-
- name: Setup MariaDB
uses: frederic34/setup-mariadb@v1
with:
# mariadb-version: ${{ matrix.mariadb-version }}
database: travis # Specify your database name
- name: Create local php.ini with open_basedir restrictions
shell: cmd
# Objective: separate step, and before database initialisation to verify open_basedir restrictions
run: |-
echo "BASEDIR=%CD%" >> %GITHUB_ENV%
ECHO "==== Show INI file usage before our configuration ==="
php --ini
ECHO "==== Set PHP_INI_SCAN_DIR to include the INI File we create ==="
mkdir %PHP_INI_SCAN_DIR%
SET INIFILE="%PHP_INI_SCAN_DIR%\dolibarr.ini"
SET HTDOCS_DIR=%CD%\htdocs
SET DATA_DIR=%CD%\documents
SET TEST_DIR=%CD%\test
SET INITDEMO_DIR=%CD%\dev\initdemo
ECHO "==== Create INI file to set open_basedir ==="
echo [php] > %INIFILE%
echo open_basedir^="%HTDOCS_DIR%;%DATA_DIR%;%TEST_DIR%;%INITDEMO_DIR%;%PHPROOT%" >> %INIFILE%
REM Unset PHP_INI_SCAN_DIR to disable open_basedir restritions (to limit debug effort)
REM SET PHP_INI_SCAN_DIR=
ECHO "==== Show contents of INI file to set open_basedir ==="
type %INIFILE%
ECHO "==== Verify it is used by PHP ==="
php --ini
REM TEST OPEN_BASEDIR restriction is not limiting wrongly
REM THE DATA_DIR MUST BE CREATED HERE - open_base does not allow it's creation
mkdir "%DATA_DIR%"
mkdir "%DATA_DIR%\mytest"
php -r "$d=implode(DIRECTORY_SEPARATOR,[__DIR__,'documents','mytest']);echo 'IS_DIR '.$d.' '.((int) is_dir($d)).PHP_EOL;"
php -r "$d=__DIR__.'\documents/mytest';echo 'TEST PATH IS SHOWN: '.$d.PHP_EOL;"
php -r "$d=__DIR__.'\documents/mytest';echo 'IS_DIR '.$d.' '.((int) is_dir($d)).PHP_EOL;"
ECHO "The above should show 2 successful tests"
- name: Run Bash script that Initialises the database
# Note this is bash (MSYS) on Windows
shell: bash
run: |
ECHO "#[group]Directory contents to verify cache files, ..."
ls -l
ECHO "#[endgroup]"
ECHO "==== Verify openbase_dir restriction"
php --ini
# Run bash script to initialise database
ECHO "==== Start 'setup_conf.sh' to setup database"
${SHELL} -xv dev/setup/phpunit/setup_conf.sh
## Updating test configuration to not stop on first failure (to see all errors) - need sed
sed -i -e 's/stopOnFailure="[^"]*"/stopOnFailure="false"/' test/phpunit/phpunittest.xml
ECHO "#[group]Directory contents after database setup to verify cache files, ..."
ls -l
ECHO "#[endgroup]"
# Export some tool paths to reuse the from CMD shell.
echo "TAIL=$(cygpath -w "$(which tail)")" >> "$GITHUB_ENV"
echo "GREP=$(cygpath -w "$(which grep)")" >> "$GITHUB_ENV"
echo "TEE=$(cygpath -w "$(which tee)")" >> "$GITHUB_ENV"
echo "BASEDIR=$(realpath .)" >> "$GITHUB_ENV"
- name: Run PHPUnit tests
# continue-on-error: true
shell: cmd
# setting up php.ini, starting the php server are currently in this step
run: |-
ECHO "==== Visually verify our dolibarr.INI file usage ==="
php --ini
ECHO "==== Add our web server information to the config file ==="
echo $dolibarr_main_url_root="http://${{ env.PHPSERVER_DOMAIN_PORT }}"; >> htdocs/conf/conf.php
ECHO "#[group]==== Dolibarr config file contents"
cat htdocs/conf/conf.php
ECHO "#[endgroup]"
ECHO "==== START PHP server"
start /B php -S %PHPSERVER_DOMAIN_PORT% -t htdocs >> %PHPSERVER_LOG% 2>&1
ECHO "#[group]==== Output from curl on PHP server"
curl "http://${{ env.PHPSERVER_DOMAIN_PORT }}"
ECHO "#[endgroup]"
ECHO "==== START PHPUNIT TESTS"
REM 'DOSKEY' USED to recover error code (no pipefile equivalent in windows?)
( php "%PHPROOT%\phpunit" -d memory_limit=-1 -c %CD%\test\phpunit\phpunittest.xml "test\phpunit\AllTests.php" --exclude-group WindowsWaitingForFix & call doskey /exename=err err=%%^^errorlevel%% ) | "${{ env.TEE }}" "${{ env.PHPUNIT_LOG }}"
echo ""
echo "Ensure that PHPUNIT completed (no early exit from code)"
"${{ env.TAIL }}" -5 "${{ env.PHPUNIT_LOG }}" | "${{ env.GREP }}" -qE "(OK .*[0-9]+ tests.*[0-9]+ assertions|Tests: [0-9]+)" || EXIT /B 1
echo "PHPUNIT seems to have completed with a test result, reuse the exit code"
for /f "tokens=2 delims==" %%A in ('doskey /m:err') do EXIT /B %%A
- name: Convert Raw Log to Annotations
uses: mdeweerd/logToCheckStyle@v2024.3.5
if: ${{ failure() }}
with:
in: ${{ env.PHPUNIT_LOG }}
- name: Provide dolibarr and phpunit logs as artifact
uses: actions/upload-artifact@v4
if: ${{ ! cancelled() }}
with:
name: win-ci-logs
path: |
${{ env.PHPUNIT_LOG }}
${{ env.DOLIBARR_LOG }}
${{ env.PHPSERVER_LOG }}
db_init.sql
db_init.sql.md5
retention-days: 2
# Save cache
- name: Save cache
uses: actions/cache/save@v4
if: ${{ ! cancelled() }}
with:
# See https://github.com/actions/cache/issues/1275#issuecomment-1925217178
enableCrossOsArchive: true
key: ${{ steps.cache.outputs.cache-primary-key }}
path: |
./db_init.sql
./db_init.sql.md5
./.cache/mariadb

83
.gitignore vendored Normal file → Executable file
View File

@@ -1,91 +1,14 @@
htdocs/conf/conf.php
htdocs/conf/conf.php.old
htdocs/conf/conf.php.sav
htdocs/conf/conf.php.back
documents/
custom/
custom2/
test/report/
nbproject
default.properties
.settings/
.buildpath
.gitmodules
/.project
/.pydevproject
/.vscode
.DS_Store
*.iml
*.orig
Thumbs.db
/dolibarr_genesis.mp4
.phpunit.result.cache
# Log files
dolibarr_install.log
upgrade.log
doxygen_warnings.log
# Vagrant generated files
.vagrant
# Composer installed repositories
/htdocs/includes/**/.git
# Composer autoloader and unwanted files
composer.phar
htdocs/includes/autoload.php
htdocs/includes/bin/
htdocs/includes/composer/
htdocs/includes/doctrine/
htdocs/includes/jakub-onderka/
htdocs/includes/phpdocumentor/
htdocs/includes/phpspec/
htdocs/includes/phpunit/
htdocs/includes/php-parallel-lint/
htdocs/includes/sebastian/
htdocs/includes/squizlabs/
htdocs/includes/webmozart/
htdocs/.well-known/apple-developer-merchantid-domain-association
/factory/
/output/
# Node Modules
build/yarn-error.log
build/node_modules/
node_modules/
vendor/
tmp/
#yarn
yarn.lock
#package-lock
package-lock.json
doc/install.lock
/.asciidoctorconfig.adoc
.idea
/composer.json
/composer.lock
# Local script, executed during pre-commit
/local.sh
# Local phpstan configuration
/phpstan.neon
/phpstan-baseline.neon
# Logs
/*.log
# Vim swap files
*.sw?
# Generated by PHPUNIT.BAT
/INI_PHPUNIT
# ignore cache builds
/build/phpstan/phpstan
/build/phpstan/bootstrap_custom.php
phpstan_custom.neon
/.php-cs-fixer.cache
/.php_cs.cache
/.cache
/.project
.DS_Store

View File

@@ -1,7 +0,0 @@
# ^=[ Subject: One line short summary ]=========^|
# ~ Subject template: [KEYWORD] [ISSUENUM] DESC ~|
# ^=[ Blank: Follow the Subject with a blank line, do NOT remove ]====^|
# ^=[ Details: Describe what changed and explain why it changed ]=====^|

View File

@@ -1,97 +0,0 @@
# This is mapping list between real user name/email and entry into sources files
# If you don't want to have your real email appears here, just send a Pull Request to
# replace the second field between <> with <secret>
Laurent Destailleur <eldy@destailleur.fr> Laurent Destailleur <eldy@users.sourceforge.net>
Laurent Destailleur <eldy@destailleur.fr> eldy <eldy@destailleur.fr>
Laurent Destailleur <eldy@destailleur.fr> Laurent Destailleur <ldestailleur@teclib.com>
Laurent Destailleur <eldy@destailleur.fr> eldy10 <eldy10@master8.(none)>
Laurent Destailleur <eldy@destailleur.fr> Laurent Destailleur <ephpcsdy@destailleur.fr>
Regis Houssin <regis.houssin@inodbox.com> Regis Houssin <regis@dolibarr.fr>
Regis Houssin <regis.houssin@inodbox.com> Régis Houssin <regishoussin@device5.home>
Juanjo Menent <jmenent@2byte.es> simnandez <jmenent@2byte.es>
Juanjo Menent <jmenent@2byte.es> Juanjo Menent <simnandez@gmail.com>
Juanjo Menent <jmenent@2byte.es> Simnandez <jmenent@2byte.es>
Juanjo Menent <jmenent@2byte.es> juanjo <juanjo@samsung>
Juanjo Menent <jmenent@2byte.es> juanjo <juanjo@alienware>
Marcos García de La Fuente <marcosgdf@gmail.com> Marcos García <marcosgdf@gmail.com>
Marcos García de La Fuente <marcosgdf@gmail.com> Marcos García <marcosgdf@gmail.com>
Florian Henry <florian.henry@open-concept.pro> fhenry <florian.henry@open-concept.pro>
Florian Henry <florian.henry@open-concept.pro> Florian HENRY <florian.henry@open-concept.pro>
Florian Henry <florian.henry@open-concept.pro> FHenry <florian.henry.mail@gmail.com>
Florian Henry <florian.henry@open-concept.pro> Florian HENRY <florian.henry@open-conept.pro>
Florian Henry <florian.henry@open-concept.pro> FHenry <florian.henry@open-concept.pro>
Florian Henry <florian.henry@open-concept.pro> HENRY Florian <florian.henry@open-concept.pro>
Alexandre Spangaro <aspangaro@open-dsi.fr> aspangaro <aspangaro@open-dsi.fr>
Alexandre Spangaro <aspangaro@open-dsi.fr> Spangaro Alexandre <aspangaro@open-dsi.fr>
Alexandre Spangaro <aspangaro@open-dsi.fr> Alexandre SPANGARO <aspangaro@open-dsi.fr>
Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr> Raphaël Doursenaud <rdoursenaud@free.fr>
Philippe Grand <philippe.grand@atoo-net.com> Grand Philippe <contact@atoo-net.com>
Philippe Grand <philippe.grand@atoo-net.com> Philippe GRAND <philippe.grand@atoo-net.com>
Philippe Grand <philippe.grand@atoo-net.com> philippe grand <philippe.grand@atoo-net.com>
Philippe Grand <philippe.grand@atoo-net.com> philippe <philippe.grand@atoo-net.com>
Philippe Grand <philippe.grand@atoo-net.com> unknown <Philippe@grandoc.(none)>
Philippe Grand <philippe.grand@atoo-net.com> philippe <philippe@PC-de-philippe>
Philippe Grand <philippe.grand@atoo-net.com> Philippe Grand <contact@atoo-net.com>
Jean-François Ferry <jfefe@aternatik.fr> jfefe <jfefe@aternatik.fr>
Jean-François Ferry <jfefe@aternatik.fr> jfefe <jf.ferry@aternatik.fr>
Jean-François Ferry <jfefe@aternatik.fr> JF FERRY <jfefe@aternatik.fr>
Jean-François Ferry <jfefe@aternatik.fr> JF FERRY <meos@devmachine.(none)>
Charles Benke <charles.fr@benke.fr> BENKE Charles <charles.fr@benke.fr>
Charles Benke <charles.fr@benke.fr> BENKE Charlie <charles.fr@benke.fr>
Charles Benke <charles.fr@benke.fr> defrance69 <charles.fr@benke.fr>
Maxime Kohlhaas <mko@atm-consulting.fr> MAxime Kohlhaas <maxime@atm-consulting.fr>
Frédéric France <frederic.france@free.fr> Frédéric FRANCE <frederic.france@free.fr>
Frédéric France <frederic.france@free.fr> frederic34 <frederic.france@free.fr>
Frédéric France <frederic.france@free.fr> FRANCE Frédéric <frederic.france@free.fr>
Frédéric France <frederic.france@free.fr> frederic34 <fred@ubuntuserver.(none)>
Cyrille de Lambert <cyrille.delambert@auguria.net> cdelambert <cdelambert>
Cédric Gross <c.gross@kreiz-it.fr> KreizIT <KreizIT@users.noreply.github.com>
Cédric Gross <c.gross@kreiz-it.fr> Cedric <c.gross@kreiz-it.fr>
Cédric Gross <c.gross@kreiz-it.fr> Cedric GROSS <c.gross@kreiz-it.fr>
Jean Heimburger <jean@tiaris.info> jean <jean@tiaris.info>
Jean Heimburger <jean@tiaris.info> tiaris <tiaris>
Benoit Mortier <benoit.mortier@opensides.be> opensides <opensides>
Eric Seigne <contact@ryxeo.com> erics <erics>
Jean-Louis Bergamo <jl@bergamo.fr> jlb <jlb>
Remco Gerbrands <remco@artoge.nl> r2gnl <r2gnl>
Phf <phf@atm-consulting.fr> phf <phf@atm-consulting.fr>
Yannick Warnier <ywarnier@beeznest.org> ywarnier <ywarnier>
Jerome Warnier <jwarnier@beeznest.org> jwarnier <jwarnier>
Franky Van Liedekerke <liedekef@telenet.be> liedekef <liedekef>
Lalaina Rasamoelina <lalaina.rasamoelina@biblibre.com> lalaina rasamoelina <lalaina.rasamoelina@biblibre.com>
Marc Ocebo <marc_ocebo> marc_ocebo <marc_ocebo>
Unknown <secret> box7890 <box7890>
Unknown <secret> beedauchon <beedauchon>
Loic <secret> loic <loic>
Christophe Combelle <ccomb>
Unknown <secret> activdev <activdev>
Unknown <secret> bouba <bouba>
Unknown <secret> bcroq <bcroq>
Unknown <secret> dutoit <dutoit>
Unknown <secret> bureau2crea <bureau2crea>
Unknown <secret> unknown <mne02@.modula71.local>
Simon Tosser <secret> simontosser <simontosser>
Unknown <secret> tipaul <tipaul>
Raphaël Bertrand <secret> raphael_bertrand <raphael_bertrand>
Claudio Aschieri <c.aschieri@19.coop> cla <c.aschieri@19.coop>
Tommaso Basilici <t.basilici@19.coop> kaos <t.basilici@19.coop>
Tommaso Basilici <t.basilici@19.coop> Tommaso Basilici <t.basilici@19.coop>
Faust <faust@19.coop> faust <faust@19.coop>
Ferran Marcet <secret> fmarcet <fmarcet@imedia>
Geoffrey Girard <geoffre.girard@atm-consulting.fr> geoffrey.girard <geoffre.girard@atm-consulting.fr>
Bernard Paquier <eshop.bpaquier@gmail.com> BadPixxel <eshop.bpaquier@gmail.com>
Patrick Delcroix <delcroip@gmail.com> delcroix Patrick <delcroip@gmail.com>
Damien Clochard <damien@dalibo.com> damien clochard <damien@dalibo.info>
Damien Clochard <damien@dalibo.com> damien clochard <damien@dalibo.com>
Grégory David <groolot@groolot.net> Grégory DAVID <groolot@groolot.net>
Grégory David <groolot@groolot.net> Gregory DAVID <groolot@groolot.net>
Baffir Abbes <bafbes@users.noreply.github.com> bafbes <bafbes@users.noreply.github.com>
Kevin Guerrier <guerrier.k@gmail.com> GUERRIER Kevin <guerrier.k@gmail.com>
Remy Younes <ryounes@gmail.com> remy <ryounes@gmail.com>
Estephe Loridan <github@estephe.me> Estephe L. <github@estephe.me>
Anthony Berton <anthony.berton@bb2a.fr> Anthony Berton <anthony.berton@bb2a.fr>
Anthony Berton <anthony.berton@bb2a.fr> Berton Anthony <anthony.berton@bb2a.fr>
Anthony Berton <anthony.berton@bb2a.fr> BB2A-Anthony <anthony.berton@bb2a.fr>
Anthony Berton <anthony.berton@bb2a.fr> Anthony Berton <bertonanthony@gmail.com>
Anthony Berton <anthony.berton@bb2a.fr> Berton Anthony <bertonanthony@gmail.com>
Anthony Berton <anthony.berton@bb2a.fr> BB2A-Anthony <bertonanthony@gmail.com>

View File

@@ -1,4 +0,0 @@
<?php
/* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*/
return include __DIR__ . "/../dev/tools/phan/config.php";

View File

@@ -1,265 +0,0 @@
---
exclude: (?x)^( htdocs/includes/ckeditor/.*|(\.[^/]*/.*))$
repos:
# Several miscellaneous checks and fix (on yaml files, end of files fix)
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
hooks:
# This hook tests the name of the branch and return an error if the name is
# 'develop' or an official version 'x.y'
# So you can't commit if your branch name is not a custom branch name.
# Using a custom branch name is good practice that makes it easier to manage PRs.
# You can skip this:
# - Permanently:
# export SKIP=no-commit-to-branch # In your .bashrc or session.
# - Only this for one commit:
# SKIP=no-commit-to-branch git commit -a -m "My message"
# - Skipping all checks for a commit:
# git commit -a -m "My message" --no-verify
# (Recommendation: run git commit -a .. once, then with `--no-verify`)
- id: no-commit-to-branch
args: [--branch, develop, --pattern, \d+.0]
# This checks that xml files are correct
- id: check-xml
exclude: |
(?x)^(htdocs/includes/.*)$
# This checks that yaml files are correct
- id: check-yaml
args: [--unsafe]
# This checks that json files are correct
- id: check-json
# Fixes Fix files that have DOS end of line endings
- id: mixed-line-ending
# alternative for dev/tools/fixdosfiles.sh
exclude: |
(?x)^(htdocs/includes/tecnickcom/tcpdf/fonts/.*
|.*/CRLF.*.php # Files in swiftmailer
)$
args: [--fix=lf]
# Remove trailing whitespace
- id: trailing-whitespace
exclude_types: [markdown]
# Fix the end of file
- id: end-of-file-fixer
# Check that there are no completely merged file conflicts
- id: check-merge-conflict
stages: [pre-commit, pre-rebase, pre-commit, pre-merge-commit]
# Check that files with shebangs have the executable bit set (in git)
- id: check-executables-have-shebangs
# Check that shell files are executables
- id: check-shebang-scripts-are-executable
exclude:
(?x)^( dev/tools/dolibarr-postgres2mysql.php |test/other/test_serialize.php
|test/phpunit/textutf8.txt |test/phpunit/textiso.txt |htdocs/includes/.*
|htdocs/modulebuilder/template/.* |build/debian/dolibarr.postrm |build/debian/dolibarr.postinst
|build/debian/dolibarr.config )$
# Fix the first UTF8 byte
- id: fix-byte-order-marker
# Check that there are no files that have are the same when uppercased (conflict on windows)
- id: check-case-conflict
# Beautify shell scripts
- repo: https://github.com/gitleaks/gitleaks.git
rev: v8.16.1
hooks:
- id: gitleaks
# Beautify shell scripts
- repo: https://github.com/lovesegfault/beautysh.git
rev: v6.2.1
hooks:
- id: beautysh
exclude: |
(?x)^(dev/setup/git/hooks/pre-commit
)$
args: [--tab]
# Run local script
#
# For example, to update the license in edited files, you could add to local.sh:
#
# ```shell
# #!/bin/bash
# MYDIR=$(dirname "$0")
# git diff HEAD --name-only | grep -v includes | \
# xargs "$MYDIR/dev/tools/updatelicense.php"
# ```
- repo: local
hooks:
- name: Find missing/unused/duplicate language keys
id: check-translations
files: (?x)^(htdocs/langs/en_US/.*\.lang)
language: script
entry: ./dev/translation/sanity_check_trans_missing_unused.sh
pass_filenames: false
args: [list]
- id: local-precommit-script
name: Run local script before commit if it exists
language: system
entry: bash -c '[ ! -x local.sh ] || ./local.sh'
pass_filenames: false
- id: duplicate-lang-lines
stages: [manual]
name: Find duplicate language lines
files: (?x)^(htdocs/langs/en_US/.*\.lang)
language: script
entry: ./dev/tools/fixduplicatelanglines.sh
pass_filenames: false
args: [list]
- id: duplicate-lang-keys
stages: [manual]
name: Find duplicate language keys
files: (?x)^(htdocs/langs/en_US/.*\.lang)
language: script
entry: ./dev/tools/fixduplicatelangkey.sh
pass_filenames: false
args: [list]
- id: fix-alt-languages
stages: [manual]
name: Fix alt languages
# Selection: see fixaltlanguages.sh script
files: (?x)^(htdocs/langs/(e[lnstu]|k[akmno]|s[lqrv]|b[nrs]|c[asy]|n[bel]|[ip]t|a[mr]|d[ae]|f[ar]|h[ei]|m[sy]|t[ag]|u[kr]|gl|ja|lo|ru|vi|zh)_[^/]*/.*\.lang)
language: script
entry: ./dev/tools/fixaltlanguages_pre-commit.sh
pass_filenames: true
# Check PHP syntax
- repo: https://github.com/mdeweerd/pre-commit-php
rev: v1.6.8
hooks:
- id: php-cbf
files: \.(php)$
args: [--standard=dev/setup/codesniffer/ruleset.xml]
- id: php-cs
files: \.(php)$
args:
[
--standard=dev/setup/codesniffer/ruleset.xml,
--report=emacs,
--severity=5,
--no-colors,
]
- alias: php-cs-with-cache
id: php-cs
# Configuration for ci - run on all files with cache
stages: [manual]
args:
[
--standard=dev/setup/codesniffer/ruleset.xml,
--report=emacs,
--severity=5,
--no-colors,
--cache=.cache/pre-commit/dolibarr-php-cs.cache,
.,
]
pass_filenames: false # Run on all files
- id: php-lint
- id: php-stan
stages: [manual]
files: \.(php)$
# Prettier (format code, only for non common files)
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v3.0.3
hooks:
- id: prettier
stages: [manual]
exclude:
(?x)^( .*\.(phar |min\.css |lock) |htdocs/(includes|theme/common)/.*
)$
exclude_types:
- php
- executable
- binary
- shell
- javascript
- markdown
- html
- less
- plain-text
- scss
- css
- yaml
# Check format of yaml files
- repo: https://github.com/adrienverge/yamllint.git
rev: v1.33.0
hooks:
- id: yamllint
args:
- --no-warnings
- -d
- "{extends: relaxed, rules: {line-length: {max: 120}}}"
# Execute codespell to fix typo errors (setup of codespell into dev/tools/codespell/)
- repo: https://github.com/codespell-project/codespell
rev: v2.2.6
hooks:
- id: codespell
# Due to a current limitation of configuration files,
# we can specify two dicts only on the CLI.
# You can update the contents of the exclude-file codespell-lines-ignore with the script
# dev/tools/codespell/addCodespellIgnores.sh
args:
- -D
- "-"
- -D
- dev/tools/codespell/codespell-dict.txt
- -I
- dev/tools/codespell/codespell-ignore.txt
- -x
- dev/tools/codespell/codespell-lines-ignore.txt
exclude_types: [image]
exclude: (?x)^(.phan/stubs/.*)$
additional_dependencies: [tomli]
- alias: codespell-lang-en_US
# Only for translations with specialised exceptions
# -D contains predefined conversion dictionaries
# -L is to ignore some words
id: codespell
files: ^htdocs/langs/en_US/.*$
args:
- -D
- "-"
- -D
- dev/tools/codespell/codespell-dict.txt
- -L
- informations,medias,uptodate,reenable,crypted,developpers
- -L
- creat,unitl,alltime,datas,referers
- -I
- dev/tools/codespell/codespell-ignore.txt
- -x
- dev/tools/codespell/codespell-lines-ignore.txt
- --uri-ignore-words-list
- ned
# Check some shell scripts
- repo: https://github.com/shellcheck-py/shellcheck-py
rev: v0.9.0.6
hooks:
- id: shellcheck
args: [-W, "100"]
- repo: https://github.com/sqlfluff/sqlfluff
rev: 3.0.4
hooks:
- id: sqlfluff-lint
stages: [pre-commit, manual] # manual needed for ci
exclude: (?x)^
(htdocs/includes/.*
|htdocs/install/doctemplates/websites/.*_template
|htdocs/core/menus/init_menu_auguria\.sql
|htdocs/install/doctemplates/websites/website_template-.*\.sql
|(htdocs/install/mysql/data/(llx_20_c_departements\.sql
|llx_accounting_account_.*\.sql)
|(htdocs/install/mysql/migration/3\.[256]\.0-.*\.sql)
)
|htdocs/install/mysql/migration/(1[0-5]|[456789])\.0\.0-.*\.sql
|htdocs/install/mysql/migration/3\.([0134789])\.0-.*\.sql
|htdocs/install/mysql/migration/repair\.sql
|htdocs/install/mysql/tables/llx_bookcal_availabilities-bookcal\.sql
|htdocs/install/mysql/tables/llx_categorie(_(account|actioncomm|contact|fournisseur|knowledgemanagement-knowledgemanagement|member|product|project|societe|ticket-ticket|user|warehouse|website_page-website)?\.key\.sql)
|htdocs/install/mysql/tables/llx_rights_def\.key\.sql
|htdocs/install/pgsql/functions/functions(-(don|loan|mailing|opensurvey|partnership|recruitment|website))?\.sql
)$

View File

@@ -1,575 +0,0 @@
# This script is used by Travis CI to run automatically Continuous test integration
# from Dolibarr GitHub repository.
# For syntax, see https://docs.travis-ci.com/user/languages/php/
# We use dist: focal = 20.04
os: linux
dist: focal
language: generic
#scan_logs: false
git:
depth: 1
# Start on every boot
services:
- memcached
#- mysql
- postgresql
addons:
mariadb: '10.5'
env:
global:
# Set to true for very verbose output
- DEBUG=true
cache:
directories:
- ~/.cache
jobs:
fast_finish: true
allow_failures:
- php: '8.3'
include:
- stage: PHP min and max
if: type = push
php: '7.1'
env:
- DB=postgresql
- TRAVIS_PHP_VERSION=7.1
- stage: PHP min and max
if: type = pull_request OR type = push
php: '8.2'
env:
- DB=mysql
- TRAVIS_PHP_VERSION=8.2
- stage: PHP 8.3
if: type = push AND branch = develop
php: '8.3'
env:
- DB=mysql
- TRAVIS_PHP_VERSION=8.3
notifications:
email:
on_success: never # [always|never|change] default: change
on_failure: never # [always|never|change] default: always
irc:
channels:
- "chat.freenode.net#dolibarr"
on_success: change
on_failure: always
use_notice: true
before_install:
- |
echo "Remove awful phpenv and install packages"
sudo rm -fr ~/.phpenv
sudo rm -fr /root/.phpenv
sudo add-apt-repository -y ppa:ondrej/php
sudo apt-get update
echo TRAVIS_PHP_VERSION=$TRAVIS_PHP_VERSION
- |
echo Install packages for PHP
sudo apt-get install -y pgloader memcached
if [ "$TRAVIS_PHP_VERSION" = '7.1' ]; then
sudo apt install unzip apache2 php7.1 php7.1-cli php7.1-curl php7.1-mysql php7.1-pgsql php7.1-gd php7.1-imap php7.1-intl php7.1-ldap php7.1-xml php7.1-mbstring php7.1-xml php7.1-zip libapache2-mod-php7.1
fi
if [ "$TRAVIS_PHP_VERSION" = '8.1' ]; then
sudo apt install unzip apache2 php8.1 php8.1-cli php8.1-curl php8.1-mysql php8.1-pgsql php8.1-gd php8.1-imap php8.1-intl php8.1-ldap php8.1-xml php8.1-mbstring php8.1-xml php8.1-zip libapache2-mod-php8.1
fi
if [ "$TRAVIS_PHP_VERSION" = '8.2' ]; then
sudo apt install unzip apache2 php8.2 php8.2-cli php8.2-curl php8.2-mysql php8.2-pgsql php8.2-gd php8.2-imap php8.2-intl php8.2-ldap php8.2-xml php8.2-mbstring php8.2-xml php8.2-zip libapache2-mod-php8.2
fi
if [ "$TRAVIS_PHP_VERSION" = '8.3' ]; then
sudo apt install unzip apache2 php8.3 php8.3-cli php8.3-curl php8.3-mysql php8.3-pgsql php8.3-gd php8.3-imap php8.3-intl php8.3-ldap php8.3-xml php8.3-mbstring php8.3-xml php8.3-zip libapache2-mod-php8.3
fi
- |
echo Install pgsql if run is for pgsql
if [ "$DB" = 'postgresql' ]; then
echo "Check pgloader version"
pgloader --version
#ps fauxww | grep postgres
ls /etc/postgresql/13/main/
sudo sed -i -e '/local.*peer/s/postgres/all/' -e 's/peer\|md5/trust/g' /etc/postgresql/13/main/pg_hba.conf
sudo cat /etc/postgresql/13/main/pg_hba.conf
sudo service postgresql restart
psql postgresql://postgres:postgres@127.0.0.1:5432 -l -A
psql postgresql://postgres:postgres@127.0.0.1:5432 -c 'create database travis;'
psql postgresql://postgres:postgres@127.0.0.1:5432 -c "CREATE USER travis WITH ENCRYPTED PASSWORD 'travis';"
psql postgresql://postgres:postgres@127.0.0.1:5432 -c 'GRANT ALL PRIVILEGES ON DATABASE travis TO travis;'
psql postgresql://postgres:postgres@127.0.0.1:5432 -l -A
fi
install:
- |
if [ "$TRAVIS_PHP_VERSION" = '7.1' ]; then
sudo update-alternatives --set php /usr/bin/php7.1
fi
if [ "$TRAVIS_PHP_VERSION" = '8.1' ]; then
sudo update-alternatives --set php /usr/bin/php8.1
fi
if [ "$TRAVIS_PHP_VERSION" = '8.2' ]; then
sudo update-alternatives --set php /usr/bin/php8.2
fi
php -i | head -
- |
echo "Updating Composer config"
curl -sS https://getcomposer.org/installer -o /tmp/composer-setup.php
HASH=`curl -sS https://composer.github.io/installer.sig`
echo $HASH
php -r "if (hash_file('SHA384', '/tmp/composer-setup.php') === '$HASH') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
sudo php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer
sudo chmod -R a+rwx /usr/local/bin/composer
#sudo apt install composer
composer -V
composer -n config -g vendor-dir htdocs/includes
echo
- |
echo "Update Composer version and Install tools - PHP Unit, Parallel Lint, PHP CodeSniffer, PHP Vardump check - for $TRAVIS_PHP_VERSION"
echo "(composer version 2.5 is bugged and generate phpunit error Exception: Serialization of 'Closure' is not allowed)"
if [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = '7.2' ]; then
sudo composer self-update 2.2.18
composer -n require phpunit/phpunit ^7.5 \
php-parallel-lint/php-parallel-lint ^1 \
php-parallel-lint/php-console-highlighter ^0 \
php-parallel-lint/php-var-dump-check ~0.4 \
squizlabs/php_codesniffer ^3
fi
if [ "$TRAVIS_PHP_VERSION" = '7.3' ] || [ "$TRAVIS_PHP_VERSION" = '7.4' ]; then
sudo composer self-update 2.2.18
composer -n require phpunit/phpunit ^7.5 \
php-parallel-lint/php-parallel-lint ^1.2 \
php-parallel-lint/php-console-highlighter ^0 \
php-parallel-lint/php-var-dump-check ~0.4 \
squizlabs/php_codesniffer ^3
fi
# phpunit 9 is required for php 8
if [ "$TRAVIS_PHP_VERSION" = '8.0' ] || [ "$TRAVIS_PHP_VERSION" = '8.1' ] || [ "$TRAVIS_PHP_VERSION" = '8.2' ] || [ "$TRAVIS_PHP_VERSION" = '8.3' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
sudo composer self-update 2.4.4
composer -n require --ignore-platform-reqs phpunit/phpunit ^8 \
php-parallel-lint/php-parallel-lint ^1.2 \
php-parallel-lint/php-console-highlighter ^0 \
php-parallel-lint/php-var-dump-check ~0.4 \
squizlabs/php_codesniffer ^3
fi
# Remove non expected files
rm -fr /home/travis/build/Dolibarr/dolibarr/htdocs/includes/phpunit/php-code-coverage/src/Report/Html/Renderer/Template/js
echo
- |
echo "Adding path of binaries tools installed by composer to the PATH"
export PATH="$TRAVIS_BUILD_DIR/htdocs/includes/bin:$PATH"
echo $PATH
ls $TRAVIS_BUILD_DIR/htdocs/includes
ls $TRAVIS_BUILD_DIR/htdocs/includes/bin
echo
before_script:
- |
echo Start before_script
echo Current dir is `pwd`
echo Home dir is `echo ~`
echo TRAVIS_BUILD_DIR is $TRAVIS_BUILD_DIR
- |
echo "Versions information"
echo
# Check PHP
echo "PHP version"
php -i | head -
# Check Parallel-lint version
echo "Parallel-lint version"
which parallel-lint
parallel-lint -V
# Check PHP CodeSniffer version
echo "PHPCS version"
which phpcs
phpcs --version | head -
phpcs -i | head -
# Check PHP Vardump check version
echo "PHP Vardump check version"
which var_dump_check
var_dump_check --version
# Check PHPUnit version
echo "PHPUnit version"
which phpunit
phpunit --version | head -
# Check Apache version
echo "Apache version"
apache2 -v | head -
# Check Database
echo "Database version"
mysql --version | head -
psql --version
- |
echo "Setting up database"
if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ] || [ "$DB" = 'postgresql' ]; then
echo "MySQL stop"
sudo systemctl stop mariadb.service
echo "MySQL restart without pass"
#sudo mysqld_safe --skip-grant-tables --socket=/tmp/aaa
sudo mysqld_safe --skip-grant-tables --socket=/tmp/aaa &
sleep 3
sudo ps fauxww
echo "MySQL set root password"
sudo mysql -u root -h 127.0.0.1 -e "FLUSH PRIVILEGES; CREATE DATABASE IF NOT EXISTS travis CHARACTER SET = 'utf8'; ALTER USER 'root'@'localhost' IDENTIFIED BY 'password'; CREATE USER 'root'@'127.0.0.1' IDENTIFIED BY 'password'; CREATE USER 'travis'@'127.0.0.1' IDENTIFIED BY 'password'; GRANT ALL PRIVILEGES ON travis.* TO root@127.0.0.1; GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1; FLUSH PRIVILEGES;"
echo "MySQL grant"
sudo mysql -u root -h 127.0.0.1 -ppassword -e 'FLUSH PRIVILEGES; GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1; FLUSH PRIVILEGES;'
echo "MySQL list current users"
sudo mysql -u root -h 127.0.0.1 -ppassword -e 'use mysql; select * from user;'
echo "List pid file"
sudo mysql -u root -h 127.0.0.1 -ppassword -e "show variables like '%pid%';"
#sudo kill `cat /var/lib/mysqld/mysqld.pid`
#sudo systemctl start mariadb
echo "MySQL grant"
sudo mysql -u root -h 127.0.0.1 -ppassword -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;'
echo "MySQL flush"
sudo mysql -u root -h 127.0.0.1 -ppassword -e 'FLUSH PRIVILEGES;'
echo "MySQL load sql"
sudo mysql -u root -h 127.0.0.1 -ppassword -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
fi
if [ "$DB" = 'postgresql' ]; then
echo "PGSQL"
sudo mkdir -p /tmp/pgloader
sudo chmod -R a+rwx /tmp/pgloader/
sudo pgloader 'mysql://root:password@127.0.0.1/travis' 'postgresql://postgres:postgres@127.0.0.1:5432/travis'
echo 'ALTER SEQUENCE llx_accountingaccount_rowid_seq RENAME TO llx_accounting_account_rowid_seq' | psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis'
echo 'ALTER SEQUENCE llx_accounting_account_rowid_seq RESTART WITH 1000001;' | psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis'
#echo '\d llx_adherent' | psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis'
#echo '\d llx_c_country' | psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis'
# Create pgsql compatibility functions
psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis' < htdocs/install/pgsql/functions/functions.sql
fi
echo
- |
export CONF_FILE=htdocs/conf/conf.php
echo "Setting up Dolibarr '$CONF_FILE'"
echo '<?php' > $CONF_FILE
echo 'error_reporting(E_ALL);' >> $CONF_FILE
echo '$'dolibarr_main_url_root=\'http://127.0.0.1\'';' >> $CONF_FILE
echo '$'dolibarr_main_document_root=\'$TRAVIS_BUILD_DIR/htdocs\'';' >> $CONF_FILE
echo '$'dolibarr_main_data_root=\'$TRAVIS_BUILD_DIR/documents\'';' >> $CONF_FILE
echo '$'dolibarr_main_db_host=\'127.0.0.1\'';' >> $CONF_FILE
echo '$'dolibarr_main_db_name=\'travis\'';' >> $CONF_FILE
echo '$'dolibarr_main_instance_unique_id=\'travis1234567890\'';' >> $CONF_FILE
if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ]; then
echo '$'dolibarr_main_db_type=\'mysqli\'';' >> $CONF_FILE
echo '$'dolibarr_main_db_port=3306';' >> $CONF_FILE
echo '$'dolibarr_main_db_user=\'root\'';' >> $CONF_FILE
echo '$'dolibarr_main_db_pass=\'password\'';' >> $CONF_FILE
fi
if [ "$DB" = 'postgresql' ]; then
echo '$'dolibarr_main_db_type=\'pgsql\'';' >> $CONF_FILE
echo '$'dolibarr_main_db_port=5432';' >> $CONF_FILE
echo '$'dolibarr_main_db_user=\'postgres\'';' >> $CONF_FILE
echo '$'dolibarr_main_db_pass=\'postgres\'';' >> $CONF_FILE
fi
echo '$'dolibarr_main_authentication=\'dolibarr\'';' >> $CONF_FILE
cat $CONF_FILE
echo
- |
echo "Create documents directory and set permissions"
# Add admin/temp subdirectory needed for unit tests
mkdir -p $TRAVIS_BUILD_DIR/documents/admin/temp
sudo chmod -R a+rwx $TRAVIS_BUILD_DIR/documents
echo "***** First line of dolibarr.log" > $TRAVIS_BUILD_DIR/documents/dolibarr.log
echo
- |
echo "Setting up Apache"
sudo sed -i -e "s,www-data,travis,g" /etc/apache2/envvars
sudo cp -f build/travis-ci/apache.conf /etc/apache2/sites-available/000-default.conf
sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/000-default.conf
sudo cat /etc/apache2/sites-available/000-default.conf
sudo service apache2 restart
script:
- |
echo "Checking webserver availability by a wget -O - --debug http://127.0.0.1"
# Ensure we stop on error with set -e
set +e
# The wget should return a page with line '<meta name="generator" content="Dolibarr installer">
wget -O - --debug http://127.0.0.1 > test.html
head -n 200 test.html
sudo cat /var/log/apache2/travis_error_log
set +e
echo
- |
echo "Checking PHP syntax errors (only 1 version to not overload travis and avoid duplicate tests)"
# Ensure we catch errors
set -e
# Exclusions are defined in the ruleset.xml file
if [ "$TRAVIS_PHP_VERSION" = "8.1" ]; then
parallel-lint -e php --exclude dev/tools/test/namespacemig --exclude htdocs/includes/composer --exclude htdocs/includes/myclabs --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes \
--exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian \
--exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/php-parallel-lint --exclude htdocs/includes/symfony \
--exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/maximebf \
--exclude htdocs/includes/phpunit/ --exclude htdocs/includes/tecnickcom/tcpdf/include/barcodes --exclude htdocs/includes/webmozart --exclude htdocs/includes/webklex --blame .
fi
if [ "$TRAVIS_PHP_VERSION" = "8.2" ]; then
parallel-lint -e php --exclude dev/tools/test/namespacemig --exclude htdocs/includes/composer --exclude htdocs/includes/myclabs --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes \
--exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian \
--exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/php-parallel-lint --exclude htdocs/includes/symfony \
--exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/maximebf \
--exclude htdocs/includes/phpunit/ --exclude htdocs/includes/tecnickcom/tcpdf/include/barcodes --exclude htdocs/includes/webmozart --exclude htdocs/includes/webklex --blame .
fi
if [ "$TRAVIS_PHP_VERSION" = "8.3" ]; then
parallel-lint -e php --exclude dev/tools/test/namespacemig --exclude htdocs/includes/composer --exclude htdocs/includes/myclabs --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes \
--exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian \
--exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/php-parallel-lint --exclude htdocs/includes/symfony \
--exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/maximebf \
--exclude htdocs/includes/phpunit/ --exclude htdocs/includes/tecnickcom/tcpdf/include/barcodes --exclude htdocs/includes/webmozart --exclude htdocs/includes/webklex --blame .
fi
set +e
echo
- |
echo "Checking coding style (only for 1 version to not overload travis and avoid duplicate tests)"
# Ensure we catch errors
set -e
CACHE_OPT="--cache=${HOME}/.cache/dolibarr-phpcs-${TRAVIS_PHP_VERSION}.cache"
# Exclusions are defined in the ruleset.xml file
#if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_PHP_VERSION" = "8.1" ]; then
if [ "$TRAVIS_PHP_VERSION" = "8.1" ]; then
phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --severity=1 ${CACHE_OPT} --runtime-set ignore_warnings_on_exit true .;
fi
if [ "$TRAVIS_PHP_VERSION" = "8.2" ]; then
phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --severity=1 ${CACHE_OPT} --runtime-set ignore_warnings_on_exit true .;
fi
if [ "$TRAVIS_PHP_VERSION" = "8.3" ]; then
phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --severity=1 ${CACHE_OPT} --runtime-set ignore_warnings_on_exit true .;
fi
set +e
echo
- |
echo "Checking missing debug (only for 1 version to not overload travis and avoid duplicate tests)"
# Ensure we catch errors
set -e
# Exclusions are defined in the ruleset.xml file
#if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_PHP_VERSION" = "8.1" ]; then
if [ "$TRAVIS_PHP_VERSION" = "8.1" ]; then
var-dump-check --extensions php --tracy --exclude htdocs/includes --exclude test/ --exclude htdocs/public/test/ --exclude htdocs/core/lib/functions.lib.php .
fi
if [ "$TRAVIS_PHP_VERSION" = "8.2" ]; then
var-dump-check --extensions php --tracy --exclude htdocs/includes --exclude test/ --exclude htdocs/public/test/ --exclude htdocs/core/lib/functions.lib.php .
fi
if [ "$TRAVIS_PHP_VERSION" = "8.3" ]; then
var-dump-check --extensions php --tracy --exclude htdocs/includes --exclude test/ --exclude htdocs/public/test/ --exclude htdocs/core/lib/functions.lib.php .
fi
set +e
echo
- |
export INSTALL_FORCED_FILE=htdocs/install/install.forced.php
echo "Setting up Dolibarr $INSTALL_FORCED_FILE to test installation"
# Ensure we catch errors
set +e
echo '<?php ' > $INSTALL_FORCED_FILE
echo 'error_reporting(E_ALL);' >> $INSTALL_FORCED_FILE
echo '$'force_install_noedit=2';' >> $INSTALL_FORCED_FILE
if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ]; then
echo '$'force_install_type=\'mysqli\'';' >> $INSTALL_FORCED_FILE
echo '$'force_install_port=3306';' >> $INSTALL_FORCED_FILE
fi
if [ "$DB" = 'postgresql' ]; then
echo '$'force_install_type=\'pgsql\'';' >> $INSTALL_FORCED_FILE
echo '$'force_install_port=5432';' >> $INSTALL_FORCED_FILE
fi
echo '$'force_install_dbserver=\'127.0.0.1\'';' >> $INSTALL_FORCED_FILE
echo '$'force_install_database=\'travis\'';' >> $INSTALL_FORCED_FILE
echo '$'force_install_databaselogin=\'travis\'';' >> $INSTALL_FORCED_FILE
echo '$'force_install_databasepass=\'\'';' >> $INSTALL_FORCED_FILE
echo '$'force_install_prefix=\'llx_\'';' >> $INSTALL_FORCED_FILE
echo '$'force_install_createdatabase=false';' >> $INSTALL_FORCED_FILE
echo '$'force_install_createuser=false';' >> $INSTALL_FORCED_FILE
echo '$'force_install_mainforcehttps=false';' >> $INSTALL_FORCED_FILE
echo '$'force_install_main_data_root=\'$TRAVIS_BUILD_DIR/htdocs\'';' >> $INSTALL_FORCED_FILE
#cat $INSTALL_FORCED_FILE
echo
- |
echo "Upgrading Dolibarr"
# Ensure we catch errors with -e. Set this to +e if you want to go to the end to see log files.
# Note: We keep +e because with pgsql, one of upgrade process fails even if migration seems ok, so
# I disable stop on error to be able to continue.
set +e
cd htdocs/install
php upgrade.php 3.5.0 3.6.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade350360.log
php upgrade2.php 3.5.0 3.6.0 > $TRAVIS_BUILD_DIR/upgrade350360-2.log
php step5.php 3.5.0 3.6.0 > $TRAVIS_BUILD_DIR/upgrade350360-3.log
php upgrade.php 3.6.0 3.7.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade360370.log
php upgrade2.php 3.6.0 3.7.0 > $TRAVIS_BUILD_DIR/upgrade360370-2.log
php step5.php 3.6.0 3.7.0 > $TRAVIS_BUILD_DIR/upgrade360370-3.log
php upgrade.php 3.7.0 3.8.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade370380.log
php upgrade2.php 3.7.0 3.8.0 > $TRAVIS_BUILD_DIR/upgrade370380-2.log
php step5.php 3.7.0 3.8.0 > $TRAVIS_BUILD_DIR/upgrade370380-3.log
php upgrade.php 3.8.0 3.9.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade380390.log
php upgrade2.php 3.8.0 3.9.0 > $TRAVIS_BUILD_DIR/upgrade380390-2.log
php step5.php 3.8.0 3.9.0 > $TRAVIS_BUILD_DIR/upgrade380390-3.log
php upgrade.php 3.9.0 4.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade390400.log
php upgrade2.php 3.9.0 4.0.0 > $TRAVIS_BUILD_DIR/upgrade390400-2.log
php step5.php 3.9.0 4.0.0 > $TRAVIS_BUILD_DIR/upgrade390400-3.log
php upgrade.php 4.0.0 5.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade400500.log
php upgrade2.php 4.0.0 5.0.0 > $TRAVIS_BUILD_DIR/upgrade400500-2.log
php step5.php 4.0.0 5.0.0 > $TRAVIS_BUILD_DIR/upgrade400500-3.log
php upgrade.php 5.0.0 6.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade500600.log
php upgrade2.php 5.0.0 6.0.0 > $TRAVIS_BUILD_DIR/upgrade500600-2.log
php step5.php 5.0.0 6.0.0 > $TRAVIS_BUILD_DIR/upgrade500600-3.log
php upgrade.php 6.0.0 7.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade600700.log
php upgrade2.php 6.0.0 7.0.0 > $TRAVIS_BUILD_DIR/upgrade600700-2.log
php step5.php 6.0.0 7.0.0 > $TRAVIS_BUILD_DIR/upgrade600700-3.log
php upgrade.php 7.0.0 8.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade700800.log
php upgrade2.php 7.0.0 8.0.0 > $TRAVIS_BUILD_DIR/upgrade700800-2.log
php step5.php 7.0.0 8.0.0 > $TRAVIS_BUILD_DIR/upgrade700800-3.log
php upgrade.php 8.0.0 9.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade800900.log
php upgrade2.php 8.0.0 9.0.0 > $TRAVIS_BUILD_DIR/upgrade800900-2.log
php step5.php 8.0.0 9.0.0 > $TRAVIS_BUILD_DIR/upgrade800900-3.log
php upgrade.php 9.0.0 10.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade9001000.log
php upgrade2.php 9.0.0 10.0.0 > $TRAVIS_BUILD_DIR/upgrade9001000-2.log
php step5.php 9.0.0 10.0.0 > $TRAVIS_BUILD_DIR/upgrade9001000-3.log
php upgrade.php 10.0.0 11.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade10001100.log
php upgrade2.php 10.0.0 11.0.0 > $TRAVIS_BUILD_DIR/upgrade10001100-2.log
php step5.php 10.0.0 11.0.0 > $TRAVIS_BUILD_DIR/upgrade10001100-3.log
php upgrade.php 11.0.0 12.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade11001200.log
php upgrade2.php 11.0.0 12.0.0 > $TRAVIS_BUILD_DIR/upgrade11001200-2.log
php step5.php 11.0.0 12.0.0 > $TRAVIS_BUILD_DIR/upgrade11001200-3.log
php upgrade.php 12.0.0 13.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade12001300.log
php upgrade2.php 12.0.0 13.0.0 > $TRAVIS_BUILD_DIR/upgrade12001300-2.log
php step5.php 12.0.0 13.0.0 > $TRAVIS_BUILD_DIR/upgrade12001300-3.log
php upgrade.php 13.0.0 14.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade13001400.log
php upgrade2.php 13.0.0 14.0.0 > $TRAVIS_BUILD_DIR/upgrade13001400-2.log
php step5.php 13.0.0 14.0.0 > $TRAVIS_BUILD_DIR/upgrade13001400-3.log
php upgrade.php 14.0.0 15.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade14001500.log
php upgrade2.php 14.0.0 15.0.0 > $TRAVIS_BUILD_DIR/upgrade14001500-2.log
php step5.php 14.0.0 15.0.0 > $TRAVIS_BUILD_DIR/upgrade14001500-3.log
php upgrade.php 15.0.0 16.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade15001600.log
php upgrade2.php 15.0.0 16.0.0 > $TRAVIS_BUILD_DIR/upgrade15001600-2.log
php step5.php 15.0.0 16.0.0 > $TRAVIS_BUILD_DIR/upgrade15001600-3.log
php upgrade.php 16.0.0 17.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade16001700.log
php upgrade2.php 16.0.0 17.0.0 > $TRAVIS_BUILD_DIR/upgrade16001700-2.log
php step5.php 16.0.0 17.0.0 > $TRAVIS_BUILD_DIR/upgrade16001700-3.log
php upgrade.php 17.0.0 18.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade17001800.log
php upgrade2.php 17.0.0 18.0.0 > $TRAVIS_BUILD_DIR/upgrade17001800-2.log
php step5.php 17.0.0 18.0.0 > $TRAVIS_BUILD_DIR/upgrade17001800-3.log
php upgrade.php 18.0.0 19.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade18001900.log || cat $TRAVIS_BUILD_DIR/upgrade18001900.log
php upgrade2.php 18.0.0 19.0.0 > $TRAVIS_BUILD_DIR/upgrade18001900-2.log || cat $TRAVIS_BUILD_DIR/upgrade18001900-2.log
php step5.php 18.0.0 19.0.0 > $TRAVIS_BUILD_DIR/upgrade18001900-3.log || cat $TRAVIS_BUILD_DIR/upgrade18001900-3.log
php upgrade.php 19.0.0 20.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade19002000.log || cat $TRAVIS_BUILD_DIR/upgrade19002000.log
php upgrade2.php 19.0.0 20.0.0 > $TRAVIS_BUILD_DIR/upgrade19002000-2.log || cat $TRAVIS_BUILD_DIR/upgrade19002000-2.log
php step5.php 19.0.0 20.0.0 > $TRAVIS_BUILD_DIR/upgrade19002000-3.log || cat $TRAVIS_BUILD_DIR/upgrade19002000-3.log
set +e
echo
- |
echo Show some debug info like table content or log
#echo '\d llx_adherent' | psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis'
cat $TRAVIS_BUILD_DIR/upgrade18001900.log
cat $TRAVIS_BUILD_DIR/upgrade19002000.log
echo
- |
echo Result of migration scripts
ls -alrt $TRAVIS_BUILD_DIR/
echo Show content of last file
cat $TRAVIS_BUILD_DIR/"$(ls -rt $TRAVIS_BUILD_DIR/ | tail -n1)"
- |
echo "Enabling new modules"
# Enable modules not enabled into original dump
set -e
php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_ProductBatch,MAIN_MODULE_SupplierProposal,MAIN_MODULE_STRIPE,MAIN_MODULE_ExpenseReport > $TRAVIS_BUILD_DIR/enablemodule.log
php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKET,MAIN_MODULE_ACCOUNTING,MAIN_MODULE_MRP >> $TRAVIS_BUILD_DIR/enablemodule.log
php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_RECEPTION,MAIN_MODULE_RECRUITMENT >> $TRAVIS_BUILD_DIR/enablemodule.log
php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_KnowledgeManagement,MAIN_MODULE_EventOrganization,MAIN_MODULE_PARTNERSHIP >> $TRAVIS_BUILD_DIR/enablemodule.log
php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_EmailCollector >> $TRAVIS_BUILD_DIR/enablemodule.log
echo $?
cd -
set +e
echo
#cat /tmp/dolibarr_install.log
cat $TRAVIS_BUILD_DIR/enablemodule.log
echo
- |
echo "Unit testing"
# Ensure we catch errors with -e. Set this to +e instead of -e if you want to go to the end to see dolibarr.log file.
set -e
phpunit -d memory_limit=-1 -c test/phpunit/phpunittest.xml test/phpunit/AllTests.php
phpunitresult=$?
echo "Phpunit return code = $phpunitresult"
set +e
echo
after_script:
- |
echo "After script - Output last lines of dolibarr.log"
ls $TRAVIS_BUILD_DIR/documents
#cat $TRAVIS_BUILD_DIR/documents/dolibarr.log
sudo tail -n 50 $TRAVIS_BUILD_DIR/documents/dolibarr.log
echo "After script - Output last lines of apache error.log"
sudo ls /var/log/apache2
sudo tail -n 200 /var/log/apache2/travis_error_log
after_success:
- |
echo Success
after_failure:
- |
echo Failure detected, so we show samples of log to help diagnose
# This part of code is executed only if the command that fails are enclosed with set +e
# Show upgrade log files
#for ficlog in `ls $TRAVIS_BUILD_DIR/*.log`
#do
#echo "Debugging information for file $ficlog"
#cat $ficlog
#done
# Show Apache log file
echo "Debugging information for file apache error.log"
sudo tail -n 200 /var/log/apache2/travis_error_log
if [ "$DEBUG" = true ]; then
# Dolibarr log file
echo "Debugging information for file dolibarr.log (latest 50 lines)"
tail -n 200 $TRAVIS_BUILD_DIR/documents/dolibarr.log
# Database log file
echo "Debugging information for file mysql error.log"
sudo tail -n 200 /var/log/mysql/error.log
# TODO: PostgreSQL log file
echo
fi

View File

@@ -1,430 +0,0 @@
[main]
host = https://www.transifex.com
lang_map = uz: uz_UZ, sw: sw_SW, sr@latin: sr_RS
[o:dolibarr-association:p:dolibarr:r:accountancy]
file_filter = htdocs/langs/<lang>/accountancy.lang
source_file = htdocs/langs/en_US/accountancy.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:admin]
file_filter = htdocs/langs/<lang>/admin.lang
source_file = htdocs/langs/en_US/admin.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:agenda]
file_filter = htdocs/langs/<lang>/agenda.lang
source_file = htdocs/langs/en_US/agenda.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:assets]
file_filter = htdocs/langs/<lang>/assets.lang
source_file = htdocs/langs/en_US/assets.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:banks]
file_filter = htdocs/langs/<lang>/banks.lang
source_file = htdocs/langs/en_US/banks.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:bills]
file_filter = htdocs/langs/<lang>/bills.lang
source_file = htdocs/langs/en_US/bills.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:blockedlog]
file_filter = htdocs/langs/<lang>/blockedlog.lang
source_file = htdocs/langs/en_US/blockedlog.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:bookmarks]
file_filter = htdocs/langs/<lang>/bookmarks.lang
source_file = htdocs/langs/en_US/bookmarks.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:boxes]
file_filter = htdocs/langs/<lang>/boxes.lang
source_file = htdocs/langs/en_US/boxes.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:cashdesk]
file_filter = htdocs/langs/<lang>/cashdesk.lang
source_file = htdocs/langs/en_US/cashdesk.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:categories]
file_filter = htdocs/langs/<lang>/categories.lang
source_file = htdocs/langs/en_US/categories.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:commercial]
file_filter = htdocs/langs/<lang>/commercial.lang
source_file = htdocs/langs/en_US/commercial.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:companies]
file_filter = htdocs/langs/<lang>/companies.lang
source_file = htdocs/langs/en_US/companies.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:compta]
file_filter = htdocs/langs/<lang>/compta.lang
source_file = htdocs/langs/en_US/compta.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:contracts]
file_filter = htdocs/langs/<lang>/contracts.lang
source_file = htdocs/langs/en_US/contracts.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:cron]
file_filter = htdocs/langs/<lang>/cron.lang
source_file = htdocs/langs/en_US/cron.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:datapolicy]
file_filter = htdocs/langs/<lang>/datapolicy.lang
source_file = htdocs/langs/en_US/datapolicy.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:deliveries]
file_filter = htdocs/langs/<lang>/deliveries.lang
source_file = htdocs/langs/en_US/deliveries.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:dict]
file_filter = htdocs/langs/<lang>/dict.lang
source_file = htdocs/langs/en_US/dict.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:donations]
file_filter = htdocs/langs/<lang>/donations.lang
source_file = htdocs/langs/en_US/donations.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:ecm]
file_filter = htdocs/langs/<lang>/ecm.lang
source_file = htdocs/langs/en_US/ecm.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:errors]
file_filter = htdocs/langs/<lang>/errors.lang
source_file = htdocs/langs/en_US/errors.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:eventorganization]
file_filter = htdocs/langs/<lang>/eventorganization.lang
source_file = htdocs/langs/en_US/eventorganization.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:exports]
file_filter = htdocs/langs/<lang>/exports.lang
source_file = htdocs/langs/en_US/exports.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:help]
file_filter = htdocs/langs/<lang>/help.lang
source_file = htdocs/langs/en_US/help.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:holiday]
file_filter = htdocs/langs/<lang>/holiday.lang
source_file = htdocs/langs/en_US/holiday.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:hrm]
file_filter = htdocs/langs/<lang>/hrm.lang
source_file = htdocs/langs/en_US/hrm.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:install]
file_filter = htdocs/langs/<lang>/install.lang
source_file = htdocs/langs/en_US/install.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:interventions]
file_filter = htdocs/langs/<lang>/interventions.lang
source_file = htdocs/langs/en_US/interventions.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:intracommreport]
file_filter = htdocs/langs/<lang>/intracommreport.lang
source_file = htdocs/langs/en_US/intracommreport.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:knowledgemanagement]
file_filter = htdocs/langs/<lang>/knowledgemanagement.lang
source_file = htdocs/langs/en_US/knowledgemanagement.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:languages-not-res]
file_filter = htdocs/langs/<lang>/languages.lang
source_file = htdocs/langs/en_US/languages.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:ldap]
file_filter = htdocs/langs/<lang>/ldap.lang
source_file = htdocs/langs/en_US/ldap.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:loan]
file_filter = htdocs/langs/<lang>/loan.lang
source_file = htdocs/langs/en_US/loan.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:mailmanspip]
file_filter = htdocs/langs/<lang>/mailmanspip.lang
source_file = htdocs/langs/en_US/mailmanspip.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:mails]
file_filter = htdocs/langs/<lang>/mails.lang
source_file = htdocs/langs/en_US/mails.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:main]
file_filter = htdocs/langs/<lang>/main.lang
source_file = htdocs/langs/en_US/main.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:margins]
file_filter = htdocs/langs/<lang>/margins.lang
source_file = htdocs/langs/en_US/margins.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:members]
file_filter = htdocs/langs/<lang>/members.lang
source_file = htdocs/langs/en_US/members.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:modulebuilder]
file_filter = htdocs/langs/<lang>/modulebuilder.lang
source_file = htdocs/langs/en_US/modulebuilder.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:mrp]
file_filter = htdocs/langs/<lang>/mrp.lang
source_file = htdocs/langs/en_US/mrp.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:multicurrency]
file_filter = htdocs/langs/<lang>/multicurrency.lang
source_file = htdocs/langs/en_US/multicurrency.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:oauth]
file_filter = htdocs/langs/<lang>/oauth.lang
source_file = htdocs/langs/en_US/oauth.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:opensurvey]
file_filter = htdocs/langs/<lang>/opensurvey.lang
source_file = htdocs/langs/en_US/opensurvey.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:orders]
file_filter = htdocs/langs/<lang>/orders.lang
source_file = htdocs/langs/en_US/orders.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:other]
file_filter = htdocs/langs/<lang>/other.lang
source_file = htdocs/langs/en_US/other.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:partnership]
file_filter = htdocs/langs/<lang>/partnership.lang
source_file = htdocs/langs/en_US/partnership.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:paybox]
file_filter = htdocs/langs/<lang>/paybox.lang
source_file = htdocs/langs/en_US/paybox.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:paypal]
file_filter = htdocs/langs/<lang>/paypal.lang
source_file = htdocs/langs/en_US/paypal.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:printing]
file_filter = htdocs/langs/<lang>/printing.lang
source_file = htdocs/langs/en_US/printing.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:productbatch]
file_filter = htdocs/langs/<lang>/productbatch.lang
source_file = htdocs/langs/en_US/productbatch.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:products]
file_filter = htdocs/langs/<lang>/products.lang
source_file = htdocs/langs/en_US/products.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:projects]
file_filter = htdocs/langs/<lang>/projects.lang
source_file = htdocs/langs/en_US/projects.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:propal]
file_filter = htdocs/langs/<lang>/propal.lang
source_file = htdocs/langs/en_US/propal.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:receiptprinter]
file_filter = htdocs/langs/<lang>/receiptprinter.lang
source_file = htdocs/langs/en_US/receiptprinter.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:receptions]
file_filter = htdocs/langs/<lang>/receptions.lang
source_file = htdocs/langs/en_US/receptions.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:recruitment]
file_filter = htdocs/langs/<lang>/recruitment.lang
source_file = htdocs/langs/en_US/recruitment.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:resource]
file_filter = htdocs/langs/<lang>/resource.lang
source_file = htdocs/langs/en_US/resource.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:salaries]
file_filter = htdocs/langs/<lang>/salaries.lang
source_file = htdocs/langs/en_US/salaries.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:sendings]
file_filter = htdocs/langs/<lang>/sendings.lang
source_file = htdocs/langs/en_US/sendings.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:sms]
file_filter = htdocs/langs/<lang>/sms.lang
source_file = htdocs/langs/en_US/sms.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:stocks]
file_filter = htdocs/langs/<lang>/stocks.lang
source_file = htdocs/langs/en_US/stocks.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:stripe]
file_filter = htdocs/langs/<lang>/stripe.lang
source_file = htdocs/langs/en_US/stripe.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:supplier_proposal]
file_filter = htdocs/langs/<lang>/supplier_proposal.lang
source_file = htdocs/langs/en_US/supplier_proposal.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:suppliers]
file_filter = htdocs/langs/<lang>/suppliers.lang
source_file = htdocs/langs/en_US/suppliers.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:ticket]
file_filter = htdocs/langs/<lang>/ticket.lang
source_file = htdocs/langs/en_US/ticket.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:trips]
file_filter = htdocs/langs/<lang>/trips.lang
source_file = htdocs/langs/en_US/trips.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:users]
file_filter = htdocs/langs/<lang>/users.lang
source_file = htdocs/langs/en_US/users.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:website]
file_filter = htdocs/langs/<lang>/website.lang
source_file = htdocs/langs/en_US/website.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:withdrawals]
file_filter = htdocs/langs/<lang>/withdrawals.lang
source_file = htdocs/langs/en_US/withdrawals.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:workflow]
file_filter = htdocs/langs/<lang>/workflow.lang
source_file = htdocs/langs/en_US/workflow.lang
source_lang = en_US
type = MOZILLAPROPERTIES

1057
COPYING

File diff suppressed because it is too large Load Diff

194
COPYRIGHT
View File

@@ -1,88 +1,130 @@
Copyright and license
----------------------
License
-------
The Dolibarr software as a whole is distributed under the GNU General Public License as published by the Free Software Foundation;
either version 3 of the License, or (at your option) any later version (GPL-3+). More information: https://www.gnu.org/licenses/gpl-3.0.txt.
A copy of this license is available in the COPYING file.
Dolibarr depends on third-party components and code snippets released under their own license (obviously, all compatible with the one of Dolibarr).
These dependencies are listed in the bottom of this file.
Dolibarr is released under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version
However it uses some external libraries under different licences. This is compatibility summary:
The Dolibarr images resources (available in the doc directory) is distributed under the Creative Commons Attribution 4.0 International license (CC BY 4.0).
The name Dolibarr is a trademark initially registered by Laurent Destailleur and ceased to the Dolibarr foundation. You can use the name Dolibarr
for your own need as long as you follow the rules defined on the page https://wiki.dolibarr.org/index.php/Rules_to_use_the_brand_name_%22Dolibarr%22
The use of the name DoliStore is also restricted to the same rules defined on https://wiki.dolibarr.org/index.php/Rules_to_use_the_brand_name_%22Dolibarr%22
Licence of dependencies of third-party components used by Dolibarr (all compatible with the Licence of Dolibarr):
Component Version License GPL Compatible Usage
-------------------------------------------------------------------------------------
Composant Version License Compatible GPL Usage
----------------------------------------------------------------------------
PHP libraries:
EvalMath 1.0 BSD Yes Safe math expressions evaluation. Used by dynamic price only. TODO Replace with dol_eval ?
Escpos-php 3.0 MIT License Yes Thermal receipt printer library, for use with ESC/POS compatible printers
GeoIP2 0.2.0 Apache License 2.0 Yes Lib to make geoip convert
GeoPHP 1.2 Modified BSD License Yes Lib to make geo convert
MathPHP 2.8.1 MIT License Yes Modern math library for PHP (only few files)
Mobiledetect 2.8.41 MIT License Yes Detect mobile devices browsers
NuSoap 0.9.16 LGPL 2.1+ Yes Library to develop SOAP Web services. From https://github.com/f00b4r/nusoap/tree/v0.9.16
PEAR Mail_MIME 1.8.9 BSD Yes NuSoap dependency
ParseDown 1.7.4 MIT License Yes Markdown parser
PCLZip 2.8.4 LGPL-3+ Yes Library to zip/unzip files
PHPDebugBar 1.18.2 MIT License Yes Used only by the module "debugbar" for developers
PHPSpreadSheet 1.12.0 LGPL-2.1+ Yes Read/Write XLS files, read ODS files
PHP-Iban 4.1.1 LGPL-3+ Yes Parse and validate IBAN (and IIBAN) bank account information in PHP
PHP-Imap 2.7.2 MIT License Yes Library to use IMAP with OAuth
PHPoAuthLib 0.8.2 MIT License Yes Library to provide oauth1 and oauth2 to different service
PHPPrintIPP 1.3 GPL-2+ Yes Library to send print IPP requests
PrestaShop-WS-Lib 94feb5f OSL-3.0 No Library providing API client for Prestashop.
PSR/Logs 1.0 MIT License Yes Library for logs (used by DebugBar)
PSR/simple-cache ? MIT License Yes Library for cache (used by PHPSpreadSheet)
Restler 3.1.1 LGPL-3+ Yes Library to develop REST Web services (+ swagger-ui js lib into dir explorer)
Sabre 4.6.0 BSD Yes DAV support
Swift Mailer 5.4.2-DEV MIT License Yes Comprehensive mailing tools for PHP
Symfony/var-dumper ??? MIT License Yes Library to make var dump (used by DebugBar)
Stripe 10.7.0 MIT Licence Yes Library for Stripe module
TCPDF 6.3.2 LGPL-3+ Yes PDF generation
TCPDI 1.0.0 LGPL-3+ / Apache 2.0 Yes FPDI replacement
bacon, dasprid, swiss-qr-bill, kmukku, symfony/validator
AdoDb-Date 0.21 Modified BSD License Yes Date convertion (not into rpm package)
CKEditor 3.6.2 GPL or LGPL 2.1 or MPL 1.1 Yes Editor WYSIWYG
FPDI 1.4.1 Apache Software License 2.0 ? PDF templates management
GeoIP 2004 LGPL 2.1 Yes Sample code to make geoip convert (not into deb package)
NuSoap 0.9.5 LGPL 2.1 Yes Library to develop SOAP Web services (not into rpm and deb package)
OdtPHP 1.0.1 GPL 2.0 Yes Library to build/edit ODT files
PHPExcel 1.7.6 LGPL 2.1 Yes Read/Write XLS files, read ODS files
TCPDF 5.9.098 LGPL 3.0 Yes PDF generation
JS libraries:
Ace 1.4.14 BSD Yes JS library to get code syntaxique coloration in a textarea.
ChartJS 3.7.1 MIT License Yes JS library for graph
CKEditor 4.22.1 LGPL-2.1+ Yes Editor WYSIWYG
jQuery 3.6.4 MIT License Yes JS library
jQuery UI 1.13.2 GPL and MIT License Yes JS library plugin UI
jQuery select2 4.0.13 GPL and Apache License Yes JS library plugin for sexier multiselect. Warning: 4.0.6+ create troubles without patching css
jQuery blockUI 2.70.0 GPL and MIT License Yes JS library plugin blockUI (to use ajax popups)
jQuery Colorpicker 1.1 MIT License Yes JS library for color picker for a defined list of colors
jQuery JCrop 0.9.8 GPL and MIT License Yes JS library plugin Crop (to crop images)
jQuery Jeditable 1.7.1 GPL and MIT License Yes JS library plugin jeditable (to edit in place)
jQuery jNotify 1.1.00 Apache License 2.0 Yes JS library plugin jNotify (to use ajax popups)
jQuery jPicker 1.1.6 GPL and MIT License Yes JS library for color picker with not defined list of colors
jQuery jqueryFileTree 1.0.1 GPL and MIT License Yes JS library for filetree
jQuery jquerytreeview 1.4.1 MIT License Yes JS library for filetree
jQuery TableDnD 0.6 GPL and MIT License Yes JS library plugin TableDnD (to reorder table rows)
jQuery Timepicker 1.1.0 GPL and MIT License Yes JS library Timepicker addon for Datepicker
jsGanttImproved 2.8.10 BSD License Yes JS library (to build Gantt reports)
SwaggerUI 2.2.10 GPL-2+ Yes JS library to offer the REST API explorer
Image libraries:
Octicons 8.1 MIT Yes
Font libraries:
Fontawesome 5.13 Font Awesome Free Licence Yes
jQuery 1.7.2 GPL and MIT Licence Yes JS library
jQuery UI 1.8.20 GPL and MIT Licence Yes JS library plugin UI
jQuery Colorpicker 1.1 MIT Licence Yes JS library for color picker for a defined list of colors
jQuery DataTable 1.8.1 BSD Yes JS library for tables output
jQuery Flot 0.7 MIT Licence Yes JS library to build graph
jQuery FileUpload 5.0.3 GPL and MIT Licence Yes JS library to upload files
jQuery JCrop 0.9.8 GPL and MIT Licence Yes JS library plugin Crop (to crop images)
jQuery jeditable 1.7.1 GPL and MIT Licence Yes JS library plugin jeditable (to edit in place)
jQuery jNotify 1.1.00 Apache Software License 2.0 ? JS library plugin jNotify (to use ajax popups)
jQuery jPicker 1.1.00 GPL and MIT Licence Yes JS library for color picker with not defined list of colors
jQuery Layout 1.3.0 GPL and MIT Licence Yes JS library plugin Layout (RC-29.15)
jQuery TableDnD 0.5 GPL and MIT Licence Yes JS library plugin TableDnD (to reorder table rows)
jQuery Mobile 1.0rc2 GPL and MIT Licence Yes JS library for smartphone (not used)
jQuery Tiptip 1.3 GPL and MIT Licence Yes JS library for tooltips
JSGantt 1.2 BSD Licence Yes JS library (to build Gantt reports)
For licenses compatibility informations:
http://www.fsf.org/licensing/licenses/index_html
Copyright
---------
Copyright (C) 2012
- Laurent Destailleur <eldy@users.sourceforge.net>
- Regis Houssin <regis@dolibarr.fr>
- Juanjo Menent <jmenent@2byte.es>
- Philippe Grand <philippe.grand@atoo-net.com>
- Jean Heimburger <jean@tiaris.info>
- Marcos García <marcosgdf@gmail.com>
Copyright (C) 2011
- Laurent Destailleur <eldy@users.sourceforge.net>
- Regis Houssin <regis@dolibarr.fr>
- Juanjo Menent <jmenent@2byte.es>
- Philippe Grand <philippe.grand@atoo-net.com>
- Jean Heimburger <jean@tiaris.info>
Copyright (C) 2010
- Laurent Destailleur <eldy@users.sourceforge.net>
- Regis Houssin <regis@dolibarr.fr>
- Juanjo Menent <jmenent@2byte.es>
- r2gnl
- meos
Copyright (C) 2009
- Laurent Destailleur <eldy@users.sourceforge.net>
- Regis Houssin <regis@dolibarr.fr>
- Juanjo Menent <jmenent@2byte.es>
Copyright (C) 2008
- Laurent Destailleur <eldy@users.sourceforge.net>
- Regis Houssin <regis@dolibarr.fr>
- Rodolphe Quiedeville <rodolphe@quiedeville.org>
Copyright (C) 2007
- Rodolphe Quiedeville <rodolphe@quiedeville.org>
- Laurent Destailleur <eldy@users.sourceforge.net>
- Regis Houssin <regis@dolibarr.fr>
- Auguria SARL <info@auguria.org>
- Jean Heimburger <jean@tiaris.info>
Copyright (C) 2006
- Auguria SARL <info@auguria.org>
- Marc Barilley/Ocebo <marc@ocebo.com>
- Laurent Destailleur <eldy@users.sourceforge.net>
- Rodolphe Quiedeville <rodolphe@quiedeville.org>
- Regis Houssin <regis@dolibarr.fr>
- Andre Cianfarani <acianfa@free.fr>
- Yannick Warnier <ywarnier@beeznest.org>
- Jean Heimburger <jean@tiaris.info>
Copyright (C) 2005
- Brice Davoleau <brice.davoleau@gmail.com>
- Laurent Destailleur <eldy@users.sourceforge.net>
- Benoit Mortier <benoit.mortier@opensides.be>
- Rodolphe Quiedeville <rodolphe@quiedeville.org>
- Eric Seigne <erics@rycks.com>
- Matthieu Valleton <mv@seeschloss.org>
- Regis Houssin <regis@dolibarr.fr>
Copyright (C) 2004
- Laurent Destailleur <eldy@users.sourceforge.net>
- Rodolphe Quiedeville <rodolphe@quiedeville.org>
- Eric Seigne <erics@rycks.com>
- Benoit Mortier <benoit.mortier@opensides.be>
- Christophe Combelles <ccomb@free.fr>
Copyright (C) 2003
- Jean-Louis Bergamo <jlb@j1b.org>
- Xavier Dutoit <doli@sydesy.com>
- Rodolphe Quiedeville <rodolphe@quiedeville.org>
- Emmanuel Raviart <eraviart@entrouvert.com>
- Eric Seigne <erics@rycks.com>
Copyright (C) 2002
- Jean-Louis Bergamo <jlb@j1b.org>
- Rodolphe Quiedeville <rodolphe@quiedeville.org>
Copyright (C) 2001
- Rodolphe Quiedeville <rodolphe@quiedeville.org>
For more licenses compatibility information: https://www.gnu.org/licenses/licenses.en.html
Authors
-------------------
See page https://github.com/Dolibarr/dolibarr/graphs/contributors

10529
ChangeLog

File diff suppressed because it is too large Load Diff

34
DCO
View File

@@ -1,34 +0,0 @@
Developer Certificate of Origin
Version 1.1
Copyright (C) 2002 - Today, The Dolibarr team and its contributors.
Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.
Developer's Certificate of Origin 1.1
By making a contribution to this project, I certify that:
(a) The contribution was created in whole or in part by me and I
have the right to submit it under the open source license
indicated in the file; or
(b) The contribution is based upon previous work that, to the best
of my knowledge, is covered under an appropriate open source
license and I have the right under that license to submit that
work with modifications, whether created in whole or in part
by me, under the same open source license (unless I am
permitted to submit under a different license), as indicated
in the file; or
(c) The contribution was provided directly to me by some other
person who certified (a), (b) or (c) and I have not modified
it.
(d) I understand and agree that this project and the contribution
are public and that a record of the contribution (including all
personal information I submit with it, including my sign-off) is
maintained indefinitely and may be redistributed consistent with
this project or the open source license(s) involved.

6
INSTALL Normal file
View File

@@ -0,0 +1,6 @@
INSTALL
-------
English: See file README.
French: Voir fichier README-FR.

139
README Normal file
View File

@@ -0,0 +1,139 @@
README (english)
--------------------------------
Starter documentation
--------------------------------
1) Install Dolibarr
2) Upgrade Dolibarr from an older version
3) What's new in this version
4) What Dolibarr can do
5) What Dolibarr can't do yet, todo list
I - DOLIBARR INSTALL
--------------------
If you have no technical knowledge, and you are looking for an autoinstaller
to install Dolibarr ERP/CRM in few clicks, you must download DoliWamp (the
all-in-one package of Dolibarr for Windows), DoliDeb (the all-in-one package
of Dolibarr for Debian or Ubuntu) or DoliRpm (the all-in-one package of
Dolibarr for Fedora, Redhat, Mandriva, Opensue, Mageia).
You can download this at:
http://www.dolibarr.org/downloads/
If you already have installed a Web server and a Mysql database, you can
install the standard version like this:
- Uncompress the downloaded archive.
- Copy directory "dolibarr" and all its files inside your web server root,
or copy directory anywhere and set up your web server to use "dolibarr/htdocs"
as root for a new web server virtual host (second choice need to be web
server administrator).
- Create an empty file "htdocs/conf/conf.php" and set permissions for your web
server user (write permissions will be removed once install is finished).
- From your browser, call the dolibarr "install/" page. Url depends on choice
made on first step:
http://localhost/dolibarr/htdocs/install/
or
http://yourdolibarrvirtualhost/install/
- Follow instructions provided by installer...
II - DOLIBARR UPGRADE
---------------------
To upgrade Dolibarr from an old version to this one:
- Overwrite all old files inside old 'dolibarr' directory by files
provided into new version package.
- If you came from version x.y.z to x.y.w (only third number differ),
there is no need to run any migrate process.
- If you came from a beta version or from any version x.y.z to any
other where x or y number differs, you must call the Dolibarr "install/"
page in your browser (this should be done automatically at first dolibarr
access).
This URL should looks like:
http://localhost/dolibarr/htdocs/install/
or
http://yourdolibarrhost/install/index.php
Then choose the "update" option according to your case.
Note: Migrate process can be ran safely several times.
III - WHAT'S NEW
----------------
See ChangeLog file found into package.
IV - WHAT DOLIBARR CAN DO
-------------------------
Main modules/features:
- Products and services catalog
- Customers, Prospects or Suppliers directory
- Address book
- Stock management
- Bank accounts management
- Orders management with PDF export
- Commercial proposals management with PDF export
- Contracts management
- Invoices management with PDF export
- Payments management
- Standing orders management
- Shipping management
- ECM (Electronic Content Management)
- EMailings
- Agenda with ical,vcal export for third tools integration
- Management of foundation members
- Donation management
Other modules:
- Bookmarks management
- Can reports Dolibarr events inside Webcalendar or Phenix
- Data export tools
- LDAP connectivity
- Third parties or products categories
- ClickToDial phone numbers
- RSS
Miscellanous:
- Mutli-user, with several permissions levels for each feature.
- Serveral menu managers (can be used by internal users, as a back-office,
with a particular menu, or by external users, as a front-office, with
another menu and permissions).
- Very user friendly and easy to use.
- Optional WYSIWYG forms, optional Ajax forms.
- Several skins.
- Code is highly customizable (a lot of use of modules and submodules).
- Works with Mysql 4.1 or higher, or PostgreSql 8.14 or higher.
- Works with PHP 5.0 or higher.
- An easy to understand and maintain code (PHP with no heavy frameworks).
- A trigger architecture to allow you to make Dolibarr business events run
PHP code to update your own information system.
- "NPR VAT Rate" (French particularity for managing VAT in DOM-TOM
called "Non Perçue Récupérable").
V - WHAT DOLIBARR CAN'T DO YET (TODO LIST)
------------------------------------------
This is features that Dolibarr does not support completely yet:
- No accountancy (only bank management).
- Dolibarr manage one currency at once (mono-currency).
- Dolibarr manage one company/foundation (mono-company). If you want to manage several companies or foundations, you must install several time the software (on same server or not). Another solution is to extend Dolibarr with the addon Module MultiCompany that allows to manage several companies in one Dolibarr instance (one database but with a logical isolation of datas).
- Does not support double VAT (Federal / provincial) for Canada.
- Dolibarr does not contains Payroll module.
- Tasks on module project can't have dependencies between each other.
- Dolibarr does not include any Webmail.
- Dolibarr can't do coffee (not yet).

130
README-FR Normal file
View File

@@ -0,0 +1,130 @@
README (french)
--------------------------------
Documentation démarrage rapide
--------------------------------
1) Installer Dolibarr
2) Mettre à jour Dolibarr depuis une ancienne version
3) Ce qui est nouveau dans cette version
4) Ce que peux faire Dolibarr
5) Ce que ne peux pas faire Dolibarr (pas encore)
I - INSTALLER DOLIBARR
----------------------
Si vous n'avez pas de connaissances techniques, et que vous recherchez
un programme d'installation qui install Dolibarr ERP/CRM en quelques clics,
vous devez vous réorienter vers DoliWamp (la version tout-en-un
de Dolibarr pour Windows), DoliDeb (la version tout-en-un pour Debian ou
Ubuntu) ou DoliRpm (la version tout-en-un de Dolibarr pour Fedora, Redhat,
OpenSuse, Mandriva ou Mageia).
Vous pouvez les télécharger à l'adresse:
http://www.dolibarr.org/downloads/
Si vous avez déjà installé un serveur Web avec PHP et une base de donnée (Mysql),
vous pouvez installer Dolibarr avec cette version de la manière suivante:
- Copier le répertoire "dolibarr" et son contenu dans la racine de votre serveur
web, ou bien copier le répertoire sur le serveur et configurer ce serveur pour
utiliser "dolibarr/htdocs" comme racine d'un nouveau virtual host (ce second
choix requiert des compétences et habilitations en administration du serveur
web).
- Créer un fichier vide "htdocs/conf/conf.php" et attribuer les permissions
en lecture et écriture pour le user du serveur web (les permissions en
écriture seront supprimées une fois l'installation terminée).
- Depuis votre navigateur, appeler la page "install/" de dolibarr. L'url dépend
du choix fait à la première etape:
http://localhost/dolibarr/htdocs/install/
ou
http://yourdolibarrvirtualhost/install/
- Suivez les instructions fournies par l'installeur...
II - METTRE A JOUR DOLIBARR
---------------------------
Pour mettre a jour Dolibarr depuis une vieille version vers celle ci:
- Ecraser les vieux fichiers dans le vieux repertoire 'dolibarr' par les fichiers
fournis dans ce nouveau package.
- Si vous venez d'une version x.y.z vers x.y.w (seul le 3eme chiffre varie),
il n'y a pas besoin de migration de données.
- Si vous venez d'une beta ou d'un version x.y.z vers une autre ou les numeros x
ou y varient, vous devez appelez la page "install/" de migration dans votre
navigateur (ceci doit se faire automatiquement au premier accès de l'application).
Ce sera une URL du genre:
http://localhost/dolibarr/htdocs/install/index.php
ou
http://yourdolibarrhost/install/index.php
Ensuite, choisir l'option de "mise a jour" en rapport avec votre cas.
Note: Le processus de migration peut etre lance plusieurs fois sans risque.
III - CE QUI EST NOUVEAU
------------------------
Voir fichier ChangeLog.
IV - CE QUE DOLIBARR PEUT FAIRE
-------------------------------
Modules principaux:
- Gestion de catalogue de produits et services
- Gestion de stock
- Gestion des comptes bancaires
- Annuaires des prospects et/ou client et/ou fournisseurs
- Annuaires des contacts
- Gestion des actions/taches avec un agenda intégré (ou lien avec webcalendar)
- Gestion des commandes
- Gestion des propositions commerciales
- Gestion de contrats de services
- Gestion des factures clients et fournisseurs
- Gestion des paiements
- Gestion des virements bancaires
- Gestion des expéditions
Autres modules:
- Gestion de la TVA NPR (non perçue récupérable - pour les utilisateurs français des DOM-TOM)
- Gestion des adhérents d'association
- Gestion des dons
- Gestion de marque-pages
- Agenda
- Point de vente/Caisse enregistreuse
- Fonctions d'EMailing de masses vers les clients, prospect ou utilisateurs Dolibarr
- Rapports
- Fonctions d'exports
- Connectivité LDAP
- Export PDF de tous les éléments (factures, propositions commerciales, commandes, bons expéditions, etc...)
- De nombreuses autres fonctionnalités issues de modules officiels ou non (AWStats, Bittorrent, Gravatar, Google, Webcalendar...)
Miscellanous:
- Application multi-utilisateurs avec différents niveaux de permissions par module.
- Plusieurs gestionnaires de menus (possibilité de différencier les menus pour les utilisateurs internes ou externes comme les clients ou fournisseurs).
- Application simple à utiliser.
- Plusieurs thèmes visuels.
- Code simple et facilement personnalisable.
- Fonctionne avec MySQL 4.1+ ou PostgreSql 8.1.4+.
- Fonctionne avec PHP 5.0+.
- Compatible avec toutes les offres Cloud du marché respectant les prérequis MySQL et PHP.
V - CE QUE DOLIBARR NE PEUT PAS FAIRE (TACHES A FAIRE)
------------------------------------------------------
Voici un liste de fonctionnalites pas encore gérées par Dolibarr:
- Pas de compta analytique (uniquement gestion de trésorerie).
- Dolibarr ne gère qu'une seule monnaie à la fois (mono-devise).
- Dolibarr ne gère en standard qu'une société/institution/association (mono-société). Pour en gérer plusieurs (comme vos filiales), il faut, soit faire plusieurs installations de Dolibarr, soit installer le module MutliCompany qui permet de gérer n société/institutions/associations dans une seule instance par une isolation logique des données.
- Ne gère pas la double tva (Fédérale / provinciale) du canada.
- Dolibarr ne contient pas de module de Gestion de la paie.
- Les taches du module de gestion de projets n'ont pas de dépendance entre elle.
- Dolibarr ne contient pas de Webmail.
- Dolibarr ne fait pas le café (pas encore).

View File

@@ -1,184 +0,0 @@
# DOLIBARR ERP & CRM
![Downloads per day](https://img.shields.io/sourceforge/dw/dolibarr.svg)
[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.1-8892BF.svg?style=flat-square)](https://php.net/)
[![GitHub release](https://img.shields.io/github/v/release/Dolibarr/dolibarr)](https://github.com/Dolibarr/dolibarr)
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/5521/badge)](https://bestpractices.coreinfrastructure.org/projects/5521)
Dolibarr ERP & CRM est un logiciel moderne pour gérer votre activité (société, association, auto-entrepreneurs, artisans).
Il est simple d'utilisation et modulaire, vous permettant de n'activez que les fonctions dont vous avez besoin (contacts, fournisseurs, factures, commandes, stocks, agenda, ...).
![ScreenShot](https://www.dolibarr.org/medias/dolibarr_screenshot1_1920x1080.jpg)
## LICENCE
Dolibarr est distribué sous les termes de la licence GNU General Public License v3+ ou supérieure.
## INSTALLER DOLIBARR
### Configuration simple
Si vous avez peu de compétences techniques et que vous souhaitez installer Dolibarr ERP/CRM en quelques clics, vous pouvez utiliser l'une des versions pré-packagées avec les prérequis:
- DoliWamp pour Windows
- DoliDeb pour Debian ou Ubuntu
- DoliRpm pour Redhat, Fedora, OpenSuse, Mandriva ou Mageia
Les packages peuvent être téléchargés à partir de [site web officiel](https://www.dolibarr.org/).
### Configuration avancée
Vous pouvez aussi utiliser un serveur Web et une base de données prise en charge (MariaDB, MySQL ou PostgreSQL) pour installer la version standard.
- Décompressez l'archive .zip téléchargée pour copier le répertoire "dolibarr/htdocs" et tous ses fichiers à la racine du serveur Web ou récupérez-les directement à partir de GitHub (recommandé si vous connaissez git):
  `git clone https://github.com/dolibarr/dolibarr -b x.y` (où x.y est la version principale comme 3.6, 9.0, ...)
- Configurez votre serveur Web pour qu'il utilise "*dolibarr/htdocs*" en tant que racine si votre serveur Web ne possède pas déjà de répertoire défini vers lequel pointer.
- Créez un fichier `htdocs/conf/conf.php` vide et définissez les autorisations d'*écrire* pour l'utilisateur de votre serveur Web (l'autorisation *écrire* sera supprimée une fois l'installation terminée)
- Depuis votre navigateur, allez à la page "install/" de dolibarr
LURL dépendra de la façon dont votre configuration Web a été configurée pour pointer vers votre installation de dolibarr. Cela peut ressembler à:
`http://localhost/dolibarr/htdocs/install/`
ou
`http://localhost/dolibarr/install/`
ou
`http://yourdolibarrvirtualhost/install/`
- Suivez les instructions de l'installateur
## METTRE A JOUR DOLIBARR
Pour mettre à jour Dolibarr depuis une vieille version vers celle ci:
- Faites une sauvegarde de votre instance [voir ce tutorial](https://wiki.dolibarr.org/index.php/Installation_-_Upgrade#Upgrade_Dolibarr)
- Vérifiez que la nouvelle version est compatible avec la version PHP de votre serveur [voir PHP support](https://wiki.dolibarr.org/index.php/Releases).
- Ecrasez les vieux fichiers dans le vieux répertoire 'dolibarr' par les fichiers
fournis dans ce nouveau package.
- Au prochain accès, Dolibarr proposera la page de "mise à jour" des données (si nécessaire).
Si un fichier install.lock existe pour verrouiller le processus de mise à jour, il sera demandé de le supprimer manuellement (vous devriez trouver le fichier install.lock dans le répertoire utilisé pour stocker les documents générés ou transférés sur le serveur. Dans la plupart des cas, c'est le répertoire appelé "documents")
Note: *Le processus de migration peut être lancé manuellement et plusieurs fois, sans risque, en appelant la page /install/*
## CE QUI EST NOUVEAU
Voir le fichier [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog).
## CE QUE DOLIBARR PEUT FAIRE
### Modules principaux (tous optionnels)
- Annuaires des prospects et/ou client et/ou fournisseurs
- Gestion de catalogue de produits et services
- Gestion des devis, propositions commerciales
- Gestion des commandes
- Gestion des factures clients/fournisseurs et paiements
- Gestion des virements bancaires SEPA
- Gestion des comptes bancaires
- Calendrier/Agenda partagé (avec export ical, vcal)
- Suivi des opportunités et/ou projets (suivi de rentabilité incluant les factures, notes de frais, temps consommé valorisé, ...)
- Gestion de contrats de services
- Gestion de stock et inventaires
- Gestion des expéditions
- Gestion des demandes de congés
- Gestion des notes de frais
- Gestion de recrutement
- GED (Gestion Electronique de Documents)
- E-Mailings de masse
- Réalisation de sondages
- Gestion d'adhérents
- Point de vente/Caisse enregistreuse
- … (près de 100 modules disponibles en standard, près de 1000 autre sur la place de marché d'extensions)
### Autres modules
- Gestion de marque-pages
- Gestion des promesses de dons
- Rapports
- Imports/Exports des données
- Support des codes barres
- Calcul des marges
- Connectivité LDAP
- Intégration de ClickToDial
- Intégration RSS
- Intégration Skype
- Intégration de système de paiements (PayPal, Stripe, Paybox...)
-
### Divers
- Multi-langue.
- Multi-utilisateurs avec différents niveaux de permissions par module.
- Multidevise.
- Peux être multi-société par ajout du module externe multi-société.
- Plusieurs thèmes visuels.
- Application simple à utiliser.
- Requiert PHP et MariaDb, Mysql ou Postgresql (Voir versions exactes sur [https://wiki.dolibarr.org/index.php/Prérequis](https://wiki.dolibarr.org/index.php/Prérequis)).
- Compatible avec toutes les offres Cloud du marché respectant les prérequis de base de données et PHP.
- APIs.
- Génération PDF et ODT des éléments (factures, propositions commerciales, commandes, bons expéditions, etc...)
- Code simple et facilement personnalisable (pas de framework lourd; mécanisme de hook et triggers).
- Support natif de nombreuses fonctions spécifiques aux pays comme:
- La taxe espagnole TE et ISPF
- Gestion de la TVA NPR (non perçue récupérable - pour les utilisateurs français des DOM-TOM)
- La loi française Finance 2016 et logiciels de caisse
- La double taxe canadienne
- Le timbre fiscal tunisien
- Numérotation de facture de l'argentines (avec type A,B,C...)
- Compatible avec vos processus RGPD
- ...
-
### Extension
Dolibarr peut aussi être étendu à volonté avec l'ajout de modules/applications externes développées par des développeurs tiers, disponible sur [DoliStore](https://www.dolistore.com).
## CE QUE DOLIBARR NE PEUT PAS (ENCORE) FAIRE
Voici un liste de fonctionnalités pas encore gérées par Dolibarr:
- Dolibarr ne contient pas de module de génération de feuille de paie.
- Les tâches du module de gestion de projets n'ont pas de dépendances entre elle.
- Dolibarr n'embarque pas de Webmail intégré nativement.
- Dolibarr ne fait pas le café (pas encore).
## DOCUMENTATION
La documentation utilisateur, développeur et traducteur est disponible sous forme de ressources de la communauté via le site [Wiki](https://wiki.dolibarr.org).
## CONTRIBUER
Ce projet existe grâce à ses nombreux contributeurs [[Contribuer](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)].
[![Dolibarr](https://opencollective.com/dolibarr/contributors.svg?width=890&button=false)](https://github.com/Dolibarr/dolibarr/graphs/contributors)
## CREDITS
Dolibarr est le résultat du travail de nombreux contributeurs depuis des années et utilise des librairies d'autres contributeurs.
Voir le fichier [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT)
## ACTUALITES ET RESEAUX SOCIAUX
Suivez le projet Dolibarr sur les réseaux francophones
- [Facebook](https://www.facebook.com/dolibarr.fr)
- [X](https://www.twitter.com/dolibarr_france)
ou sur les réseaux anglophones
- [Facebook](https://www.facebook.com/dolibarr)
- [X](https://www.twitter.com/dolibarr)
- [LinkedIn](https://www.linkedin.com/company/association-dolibarr)
- [YouTube](https://www.youtube.com/user/DolibarrERPCRM)
- [GitHub](https://github.com/Dolibarr/dolibarr)

297
README.md
View File

@@ -1,255 +1,126 @@
# DOLIBARR ERP & CRM
![Downloads per day](https://img.shields.io/sourceforge/dw/dolibarr.svg)
[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.1-8892BF.svg?style=flat-square)](https://php.net/)
[![GitHub release](https://img.shields.io/github/v/release/Dolibarr/dolibarr)](https://github.com/Dolibarr/dolibarr)
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/5521/badge)](https://bestpractices.coreinfrastructure.org/projects/5521)
Dolibarr ERP & CRM is a modern software package that helps manage your organization's activities (contacts, suppliers, invoices, orders, stocks, agenda…).
It's an Open-Source Software suite (written in PHP with JavaScript enhancements) designed for small, medium or large companies, foundations and freelancers.
You can freely use, study, modify or distribute it according to its license.
You can use it as a standalone application or as a web application to access it from the Internet or from a LAN.
Dolibarr has a large community ready to help you, free forums and [preferred partners ready to offer commercial support should you need it](https://partners.dolibarr.org)
![ScreenShot](https://www.dolibarr.org/medias/dolibarr_screenshot1_1920x1080.jpg)
## LICENSE
Dolibarr is released under the terms of the GNU General Public License as published by the Free Software Foundation; either Version 3 of the License, or (at your option) any later version (GPL-3+).
See the [COPYING](https://github.com/Dolibarr/dolibarr/blob/develop/COPYING) file for a full copy of the license.
Other licenses apply for some included dependencies. See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) for a full list.
## INSTALLING
### Simple setup
If you have low technical skills and you're looking to install Dolibarr ERP/CRM with just a few clicks, you can use one of the packaged versions:
- [DoliWamp for Windows](https://wiki.dolibarr.org/index.php/Dolibarr_for_Windows_(DoliWamp))
- [DoliDeb for Debian](https://wiki.dolibarr.org/index.php/Dolibarr_for_Ubuntu_or_Debian)
- DoliRpm for Red Hat, Fedora, OpenSuse, Mandriva or Mageia
Releases can be downloaded from [official website](https://www.dolibarr.org/).
### Recommended setup
You can use any web server supporting PHP (Apache, Nginx, ...) and a supported database (MariaDB, MySQL or PostgreSQL) to install the standard version.
Dolibarr ERP & CRM is a modern software to manage your company or foundation activity (contacts, suppliers, invoices, orders, stocks, agenda, ...).It's an opensource software (wrote with PHP language) designed for small and medium companies, foundation and freelances. You can freely install, use and distribute it as a standalone application or as a web application to use it from every internet access and media.
#### Generic install steps
## INSTALL
- Verify that your installed PHP version is supported [see PHP support](https://wiki.dolibarr.org/index.php/Releases).
If you have no technical knowledge, and you are looking for an autoinstaller to install Dolibarr ERP/CRM in few clicks, you must download DoliWamp (the all-in-one package of Dolibarr for Windows), DoliDeb (the all-in-one package of Dolibarr for Debian or Ubuntu) or DoliRpm (the all-in-one package of Dolibarr for Fedora, Redhat, Opensue, Mandriva or Mageia).
- Uncompress the downloaded .zip archive to copy the `dolibarr/htdocs` directory and all its files inside your web server root or get the files directly from GitHub (recommended if you know git as it makes it easier if you want to upgrade later):
You can download this at: [Official website] (http://www.dolibarr.org/downloads/)
`git clone https://github.com/dolibarr/dolibarr -b x.y` (where x.y is the main version like 9.0, 19.0, ...)
If you already have installed a Web server and a Mysql database, you can install the standard version like this:
- Set up your web server to use `dolibarr/htdocs` as root if your web server does not already define a directory to point to.
- Uncompress the downloaded archive.
- Create an empty `htdocs/conf/conf.php` file and set *write* permissions for your web server user (*write* permission will be removed once install is finished)
- Copy directory "dolibarr" and all its files inside your web server root, or copy directory anywhere and set up your web server to use "dolibarr/htdocs" as root for a new web server virtual host (second choice need to be server administrator).
- From your browser, go to the dolibarr "install/" page
- Create an empty file "htdocs/conf/conf.php" and set permissions for your web server user (write permissions will be removed once install is finished).
The URL will depend on how your web configuration directs to your dolibarr installation. It may look like:
- From your browser, call the dolibarr "install/" page.
`http://localhost/dolibarr/htdocs/install/`
Url depends on choice made on first step:
or
http://localhost/dolibarr/htdocs/install/
or
`http://localhost/dolibarr/install/`
http://localhost/dolibarr/install/
or
or
http://yourdolibarrvirtualhost/install/
`http://yourdolibarrvirtualhost/install/`
- Follow instructions provided by installer...
- Follow the installer instructions
### SaaS/Cloud Setup
If you lack the time to install it yourself, consider exploring commercial 'ready-to-use' Cloud offerings (refer to https://saas.dolibarr.org). Keep in mind that this third option comes with associated costs.
## UPGRADE
## UPGRADING
To upgrade Dolibarr from an old version to this one:
Dolibarr supports upgrading, usually without the need for any (commercial) support (depending on if you use any commercial extensions). It supports upgrading all the way from any version after 2.8 without breakage. This is unique in the ERP ecosystem and a benefit our users highly appreciate!
- Overwrite all old files inside old 'dolibarr' directory by files provided into new version package.
- If you came from version x.y.z to x.y.w (only third number differ), there is no need to run any migrate process.
- If you came from a beta version or from any version x.y.z to any other where x or y number differs, you must call the Dolibarr "install/" page in your browser (this should be done automatically at first dolibarr access).
This URL should looks like:
http://localhost/dolibarr/htdocs/install/
or
http://localhost/dolibarr/install/
or
http://yourdolibarrhost/install/
Then choose the "update" option according to your case.
Note: Migrate process can be ran safely several times.
Follow these step-by-step instructions to seamlessly upgrade Dolibarr to the latest version:
- At first make a backup of your Dolibarr files & then [see](https://wiki.dolibarr.org/index.php/Installation_-_Upgrade#Upgrade_Dolibarr)
- Verify that your installed PHP version is supported by the new version [see PHP support](https://wiki.dolibarr.org/index.php/Releases).
- Overwrite all old files from the 'dolibarr' directory with files provided in the new version's package.
- At your next access, Dolibarr will redirect you to the "install/" page to follow the upgrade process.
 If an `install.lock` file exists to lock any other upgrade process, the application will ask you to remove the file manually (you should find the `install.lock` file in the directory used to store generated and uploaded documents, in most cases, it is the directory called "*documents*").
## WHAT'S NEW
See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) file.
See ChangeLog file found into package.
## FEATURES
### Main application/modules (all optional)
- Third-Parties Management: Customers, Prospects (Leads) and/or Suppliers + Contacts
- Members/Membership/Foundation management
## WHAT DOLIBARR CAN DO
Product Management
### Main modules/features:
- Products and/or Services catalogue
- Stock / Warehouse management + Inventory
- Barcodes
- Batches / Lots / Serials
- Product Variants
- Bill of Materials (BOM)
- Manufacturing Orders (MO)
Customer/Sales Management
- Customers/Prospects + Contacts management
- Opportunities or Leads management
- Commercial proposals management (online signing)
- Customer Orders management
- Contracts/Subscription management
- Interventions management
- Ticket System (+ Knowledge management)
- Partnership management
- Shipping management
- Customer Invoices/Credit notes and payment management
- Point of Sale (POS)
Supplier/Purchase Management
- Suppliers/Vendors + Contacts
- Supplier (pricing) requests
- Purchase Orders management
- Delivery/Reception
- Supplier Invoices/Credit notes and payment management
- INCOTERMS
Finance/Accounting
- Invoices/Payments
- Products and services catalog
- Customers, Prospects or Suppliers directory
- Address book
- Stock management
- Bank accounts management
- Direct debit and Credit transfer management (European SEPA)
- Accounting management
- Donations management
- Loan management
- Margins
- Reports
- Orders management with PDF export
- Commercial proposals management with PDF export
- Contracts management
- Invoices management with PDF export
- Payments management
- Standing orders management
- Shipping management
- ECM (Electronic Content Management)
- EMailings
- Agenda with ical,vcal export for third tools integration
- Management of foundation members
- Donation management
Collaboration
### Other modules:
- Shared calendar/agenda (with `ical` and `vcal` import/export for third-party tools integration)
- Projects & Tasks management
- Event organization
- Ticket System
- Surveys
HR - Human Resources Management
- Employee leave management
- Expense reports
- Recruitment management
- Employee/staff management
- Timesheets
### Other application/modules
- Electronic Document Management (EDM)
- Bookmarks
- Reporting
- Data export/import
- Barcodes
- Bookmarks management
- Can reports Dolibarr events inside Webcalendar or Phenix
- Data export tools
- LDAP connectivity
- ClickToDial integration
- Mass emailing
- RSS integration
- Social platforms linking
- Payment platforms integration (PayPal, Stripe, Paybox...)
- Email-Collector
- Third parties or products categories
- ClickToDial phone numbers
- RSS
(around 100 modules available by default, 1000+ addons at the official marketplace Dolistore.com)
### Miscellanous:
### Other general features
- Mutli-user, with several permissions levels for each feature.
- Serveral menu managers (can be used by internal users, as a back-office, with a particular menu, or by external users, as a front-office, with another menu and permissions).
- Very user friendly and easy to use.
- Optional WYSIWYG forms, optional Ajax forms.
- Several skins.
- Code is highly customizable (a lot of use of modules and submodules).
- Works with Mysql 4.1 or higher, or PostgreSql 8.14 or higher.
- Works with PHP 5.0 or higher.
- An easy to understand and maintain code (PHP with no heavy frameworks).
- A trigger architecture to allow you to make Dolibarr business events run PHP code to update your own information system.
- "NPR VAT Rate" (French particularity for managing VAT in DOM-TOM called "Non Perçue Récupérable").
- Multi-Language Support (Localization in most major languages)
- Multi-users and groups with finely-grained rights
- Multi-Currency
- Multi-Company (by adding an external module)
- Very user-friendly and easy to use
- Customizable dashboards
- Highly customizable: enable only the modules you need, add user personalized fields, choose your skin, several menu managers (can be used by internal users as a back-office with a particular menu, or by external users as a front-office with another one)
- APIs (REST, SOAP)
- Code that is easy to understand, maintain and develop (PHP with no heavy framework; trigger and hook architecture)
- Support a lot of country-specific features:
- Spanish Tax RE and IRPF
- French NPR VAT rate (VAT called "Non Perçue Récupérable" for DOM-TOM)
- Canadian double taxes (federal/province) and other countries using cumulative VAT
- Tunisian tax stamp
- Argentina invoice numbering using A,B,C...
- Greece fetch customer vat details from AADE, all invoice types, MyData(external free module)
- ZATCA e-invoicing QR-Code
- Compatible with [European directives](https://europa.eu/legislation_summaries/taxation/l31057_en.htm) (2006/112/CE ... 2010/45/UE)
- Compatible with data privacy rules (Europe's GDPR, ...)
- ...
- Flexible PDF & ODT generation for invoices, proposals, orders...
- ...
### System Environment / Requirements
- PHP
- MariaDB, MySQL or PostgreSQL
- Compatible with all Cloud solutions that match PHP & MySQL or PostgreSQL prerequisites.
## WHAT DOLIBARR CAN'T DO YET (TODO LIST)
See exact requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequisite)
This is features that Dolibarr does not support completely yet:
### Extending
Dolibarr can be extended with a lot of other external applications or modules from third-party developers available at the [DoliStore](https://www.dolistore.com).
## WHAT DOLIBARR CAN'T DO YET
These are features that Dolibarr does **not** yet fully support:
- Tasks dependencies in projects
- Payroll module
- Native embedded Webmail, but you can send email to contacts in Dolibarr with e.g. offers, invoices, etc.
- Dolibarr can't do coffee (yet)
## DOCUMENTATION
Administrator, user, developer and translator's documentation are available along with other community resources in the [Wiki](https://wiki.dolibarr.org).
## CONTRIBUTING
This project exists thanks to all the people who contribute.
Please read the instructions on how to contribute (report a bug/error, a feature request, send code, ...) [[Contributing](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)]
A View on Contributors:
[![Dolibarr](https://opencollective.com/dolibarr/contributors.svg?width=890&button=false)](https://github.com/Dolibarr/dolibarr/graphs/contributors)
## CREDITS
Dolibarr is the work of many contributors over the years and uses some fine PHP libraries.
See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) file.
## NEWS AND SOCIAL NETWORKS
Follow Dolibarr project on:
- [Facebook](https://www.facebook.com/dolibarr)
- [X](https://x.com/dolibarr)
- [LinkedIn](https://www.linkedin.com/company/association-dolibarr)
- [Reddit](https://www.reddit.com/r/Dolibarr_ERP_CRM/)
- [YouTube](https://www.youtube.com/user/DolibarrERPCRM)
- [GitHub](https://github.com/Dolibarr/dolibarr)
### Sponsors
Support this project by becoming a sponsor. Your logo will show up here. 🙏 [[Become a sponsor/backer](https://opencollective.com/dolibarr#backer)]
- No accountancy (only bank management).
- Dolibarr manage one currency at once (mono-currency).
- Dolibarr manage one company/foundation (mono-company). If you want to manage several companies or foundations, you must install several time the software (on same server or not). Another solution is to extend Dolibarr with the addon Module MultiCompany that allows to manage several companies in one Dolibarr instance (one database but with a logical isolation of datas).
- Does not support double VAT (Federal / provincial) for Canada.
- Dolibarr does not contains Payroll module.
- Tasks on module project can't have dependencies between each other.
- Dolibarr does not include any Webmail.
- Dolibarr can't do coffee (not yet).

View File

@@ -1,115 +0,0 @@
# Security Policy
This file contains some policies about the security reports on Dolibarr ERP CRM project, one of the most popular Open Source ERP and CRM in the world.
## Supported Versions for security reports
Security report are valid only on current stable version (see https://dolibarr.org web site to get current stable version) or on development version (branch "develop" on https://github.com/Dolibarr/dolibarr).
## Reporting a Vulnerability
To report a vulnerability, for a private report, you can:
- Send your report on Vulnerability Disclosure Program (VDP) [https://app.yogosha.com/cvd/dolibarr/10VxeNx6Ui3rSEhAgX63US](https://app.yogosha.com/cvd/dolibarr/10VxeNx6Ui3rSEhAgX63US) (recommended for everybody)
<!--
- Or if you have permissions, use GitHub security advisory at [https://github.com/Dolibarr/dolibarr/security/advisories/new](https://github.com/Dolibarr/dolibarr/security/advisories/new)
-->
- Or send an email to security@dolibarr.org with clear textual description of the report along with steps to reproduce the issue, include attachments such as screenshots or proof of concept code as necessary.
## Hunting vulnerabilities on Dolibarr
We believe that the future of software is online SaaS. This means software are more and more critical and no technology is perfect. Working with skilled security researchers is crucial in identifying weaknesses in our technology.
If you believe you've found a security bug in our service, we are happy to work with you to resolve the issue promptly and ensure you are fairly rewarded for your discovery.
Any type of denial-of-service attack is strictly forbidden, as well as any interference with network equipment and Dolibarr infrastructure.
We recommend to install Dolibarr ERP CRM on your own server (as most Open Source software, download and use is free: [https://www.dolibarr.org/download](https://www.dolibarr.org/download)) to get access on every side of application.
### User Agent
If you try to find bug on Dolibarr, we recommend to append to your user-agent header the following value: '-securitytest-for-dolibarr'.
### Account access
You can install the web application yourself on your own platform/server so you get full access to application and sources. Download the zip of the files to put in your own web server virtual host from [https://www.dolibarr.org/download](https://www.dolibarr.org/download)
## Eligibility and Responsible Disclosure
We are happy to thank everyone who submits valid reports which help us improve the security of Dolibarr, however only those that meet the following eligibility requirements will be "validated reports" (if not, we may close the report without any answer):
You must be the first reporter of the vulnerability (duplicate reports are closed).
You must avoid tests that could cause degradation or interruption of our service (refrain from using automated tools, and limit yourself about requests per second), that's why we recommend to install software on your own platform.
You must not leak, manipulate, or destroy any user data of third parties to find your vulnerability.
Reports are processed around once a month.
## Scope for qualified vulnerabilities
ONLY vulnerabilities discovered, when the following setup on test platform is used, are "valid":
* The version to analyze must be the last version available in the "develop" branch. Reports on vulnerabilities already fixed (so already reported) in the develop branch will not be validated.
* $dolibarr_main_prod must be set to 1 in conf.php
* $dolibarr_nocsrfcheck must be kept to the value 0 in conf.php (this is the default value)
* $dolibarr_main_force_https must be set to something else than 0.
* Some constant must be set in the backoffice menu Home - Setup - Other
- MAIN_SECURITY_CSRF_WITH_TOKEN must be set to 3
- MAIN_RESTRICTHTML_ONLY_VALID_HTML = 1
- MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY = 1
- MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES = 1
- MAIN_DISALLOW_URL_INTO_DESCRIPTIONS = 1 (only relative links are allowed in descriptions/notes), or 2 (no links are allowed in descriptions/notes)
CSRF attacks and HTML injections are accepted but double check this setup that is experimental setup that already fix a lot of case and soon enabled by default.
* ONLY security reports on modules provided by default and with the "stable" status are valid (troubles in "experimental", "development" or external modules are not valid vulnerabilities).
* The root of web server must link to htdocs and the documents directory must be outside of the web server root (this is the default when using the default installer but may differs with external installer).
* The web server setup must be done so that only the documents directory is in write mode and directory listing is not allowed. The directory path htdocs/ must be read-only.
* The modules DebugBar and ModuleBuilder must NOT be enabled. (by default, these modules are not enabled. They are developer tools)
* Fail2ban rules for rate limit on the login page, forgotten password page, API calls and all public pages (/public/*) must be installed as recommended in the section "About - Admin tools - Section Access limits and mitigation".
Scope is the web application (backoffice) and the APIs.
## Examples of vulnerabilities that are Qualified for reporting.
* Remote code execution (RCE)
* Local files access and manipulation (LFI, RFI, XXE, SSRF, XSPA)
* Code injections (JS, SQL, PHP). HTML are covered only for fields that are not description, notes or comments fields (where rich content is allowed on purpose).
* Cross-Site Scripting (XSS), except from setup page of module "External web site" (allowing any content here, editable by admin user only, is accepted on purpose) and except
in the module "Web site" when permission to edit website content is allowed (injecting any data in this case is allowed too).
* Cross-Site Requests Forgery (CSRF) with real security impact (when using GET URLs, CSRF are qualified only for creating, updating or deleting data from pages restricted to admin users)
* Open redirect
* Broken authentication & session management
* Insecure direct object references (IDOR)
* Cross-Origin Resource Sharing (CORS) with real security impact
* Horizontal and vertical privilege escalation
* "HTTP Host Header" XSS
* Software version disclosure (for non-admin users only)
* Stack traces or path disclosure (for non-admin users only)
* Ability for a high-level user to edit web site pages in the CMS by including HTML or JavaScript is an expected feature. Vulnerabilities in the website module are validated only
if HTML or JavaScript injection can be done by a non-allowed user.
## Examples of vulnerabilities that are Non-qualified for reporting.
* Any vulnerabilities due to a configuration different than the one defined in chapter "Scope for qualified vulnerabilities".
* Directory Listing (this is a bad setup of the web server, not a problem into the application)
* "Self" XSS
* Clickjacking/UI redressing
* Presence of autocomplete attribute on web forms
* Logout and other instances of low-severity Cross-Site Request Forgery
* Reports from automated web vulnerability scanners (Acunetix, Vega, etc.) that have not been validated
* Reports on features on modules flagged as "deprecated", "experimental" or "development" if the module needs to be enabled for that (this is not the case on production).
* Software or libraries versions, private IP disclosure, Stack traces or path disclosure when logged-in user is admin.
* Vulnerabilities affecting outdated browsers or platforms, or vulnerabilities inside browsers themself.
* Brute force attacks on login page, password forgotten page or any public pages (/public/*) are not qualified if the recommended fail2ban rules were not installed.
* SSL/TLS best practices
* Invalid or missing SPF (Sender Policy Framework) records (Incomplete or missing SPF/DKIM/DMARC)
* Physical or social engineering attempts or issues that require physical access to a victims computer/device
* Vulnerabilities of type XSS exploited by using javascript into a website page (with permission to edit website pages) or by using php code into a website page
using the permission to edit php code are not qualified, except if this allow to get higher privileges (being able to set javascript or php code is the expected behaviour).

101
build.xml Normal file
View File

@@ -0,0 +1,101 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="dolibarr" default="hudson" basedir=".">
<!-- Exclude/ignore paths -->
<property name="ignorepaths" value="${basedir}/htdocs/conf,${basedir}/htdocs/core/filemanagerdol,${basedir}/htdocs/includes" />
<property name="ignoreregexp" value="**/PEAR/*,**/NET/*,**/HTTP/*" />
<target name="clean">
<!-- Clean up -->
<delete dir="${basedir}/hudson"/>
<delete dir="${basedir}/generatedJUnitFiles"/>
<!-- Create build directories -->
<mkdir dir="${basedir}/hudson/doxygen"/>
<mkdir dir="${basedir}/hudson/logs"/>
<mkdir dir="${basedir}/hudson/coverage"/>
</target>
<!-- Run phpmd, phpcpd, phpcs, doxygen and phploc in parallel -->
<target name="parallelTasks">
<parallel>
<!-- <antcall target="phpmd"/> -->
<antcall target="phpcpd"/>
<antcall target="phpcs"/>
<antcall target="doxygen"/>
<antcall target="phploc"/>
</parallel>
</target>
<!-- Generate pmd.xml -->
<!--
<target name="phpmd">
<exec executable="phpmd">
<arg line="htdocs xml codesize,unusedcode
-\-reportfile '${basedir}/hudson/logs/pmd.xml'
-\-ignore=${ignorepaths}
" />
</exec>
</target>
-->
<!-- Generate pmd-cpd.xml -->
<target name="phpcpd">
<exec executable="phpcpd">
<arg line=" --log-pmd '${basedir}/hudson/logs/pmd-cpd.xml'
--exclude '${basedir}/htdocs/conf'
--exclude '${basedir}/htdocs/core/filemanagerdol'
--exclude '${basedir}/htdocs/includes'
--exclude '**/PEAR/*,**/NET/*,**/HTTP/*'
--min-tokens 70
--min-lines 20
htdocs
" />
</exec>
</target>
<!-- Generate phploc.csv -->
<target name="phploc">
<exec executable="phploc">
<arg line=" --log-csv '${basedir}/hudson/logs/phploc.csv'
--exclude '${basedir}/htdocs/conf'
--exclude '${basedir}/htdocs/core/filemanagerdol'
--exclude '${basedir}/htdocs/includes'
--exclude '**/PEAR/*,**/NET/*,**/HTTP/*'
htdocs
" />
</exec>
</target>
<!-- Generate checkstyle.xml -->
<target name="phpcs">
<exec executable="phpcs" dir="${basedir}" output="${basedir}/hudson/logs/checkstyle.xml">
<arg line=" --standard=${basedir}/dev/codesniffer/jenkins_ruleset.xml
--report=checkstyle
--ignore=${ignorepaths},${ignoreregexp}
htdocs
"/>
</exec>
</target>
<!-- Generate Doxygen documentation -->
<target name="doxygen" description="Dolibarr documentation" >
<exec executable="doxygen" dir="${basedir}" failonerror="false">
<arg value="${basedir}/build/doxygen/jenkins_doxygen.doxyfile"/>
</exec>
</target>
<!-- Run unit tests and generate junit.xml and clover.xml -->
<target name="phpunit">
<exec executable="phpunit" dir="${basedir}" failonerror="true">
<arg line=" --configuration ${basedir}/test/phpunit/jenkins_phpunittest.xml
--log-junit ${basedir}/hudson/logs/junit.xml
--coverage-clover ${basedir}/hudson/coverage/clover.xml
--coverage-html ${basedir}/hudson/coverage/
test/phpunit/AllTests.php
"/>
</exec>
</target>
<target name="hudson" depends="clean,phpunit,parallelTasks"/>
</project>

1
build/.gitignore vendored Normal file → Executable file
View File

@@ -5,5 +5,6 @@
/dolibarr-*.tgz
/dolibarr-*.rpm
/dolibarr-*.zip
/dolibarr-*.tgz
/*.exe
/html

View File

@@ -1,78 +1,66 @@
README (English)
Path: /dolibarr/build/README
##################################################
Building packages
##################################################
All sub-directories of "build" directory contains files (setup or binary tools) required to build automatically Dolibarr packages.
The build directory and all its contents is absolutely not required to make Dolibarr working.
It is here only to build Dolibarr packages, and those generated packages will not contains this "build" directory.
All sub-directories of "build" directory contains files required to build
automatically Dolibarr packages.
There are several tools:
--------------------------------------------------------------------------------------------------
- To build full Dolibarr packages, launch the script
> Edit version in makepack-dolibarr.pl file.
> Launch command perl makepack-dolibarr.pl
See makepack-howto.txt for prerequisites.
--------------------------------------------------------------------------------------------------
- To build a translaction package, launch the script
> perl makepack-dolibarrlang.pl
- To build a theme package, launch the script
> perl makepack-dolibarrtheme.pl
--------------------------------------------------------------------------------------------------
- To build a package for a module, launch the script
> perl makepack-dolibarrmodule.pl
- To build an autoexe DoliWamp package:
> Install InnoSetup (http://www.jrsoftware.org)
> Install WampServer into "C:\Program Files\Wamp" (http://www.wampserver.com)
> Install WampServer addon to have versions:
Apache2.2.6, Mysql5.0.45, Php5.2.5
> Modify file build/exe/doliwamp.iss to change variable SourceDir
with value of Dolibarr repository.
> Modify AppVerName and OutputBaseFilename.
> Launch innosetup, open file build/exe/doliwamp.iss and click on
button "Compile". The .exe file will be build into directory build.
--------------------------------------------------------------------------------------------------
- To build developer documentation, launch the script
> perl dolibarr-doxygen-build.pl
- To build developper documentation, launch the script
> perl dolybarr-doxygen-build.pl
--------------------------------------------------------------------------------------------------
Note:
The build directory and all its contents is absolutely not required to make
Dolibarr working. It is here only to build Dolibarr packages, and those
generated packages will not contains this "build" directory.
You can find in "build", following sub-directories:
We can find in "build", following sub-directories:
* composer
To test an upgrade of a lib.
* debian
* deb:
To build Debian package.
* dmg:
To build Mac OS package (not ready yet).
* rpm:
To build Redhat or Mandrake package.
* doap:
To build Doap descriptor to promote/describe Dolibarr releases.
* docker:
To deploy Dolibarr with docker.
* doxygen:
Dir with config file to build doxygen documentation.
* tgz:
To build a tgz package.
* exe:
To build exe package for Windows that distribute Dolibarr sources or
to build the complete DoliWamp package.
* gource:
To build the video of history of git changes.
* tgz:
To build a zip package.
* launchpad:
Doc file to explain how to use launchpad.
* obs:
Doc file to explain how to push release onto OBS.
* doap:
To build Doap descriptor to promote/describe Dolibarr releases.
* pad:
To build a PAD file descriptor to promote/describe Dolibarr releases.
@@ -80,17 +68,5 @@ To build a PAD file descriptor to promote/describe Dolibarr releases.
* patch:
Script file to generate a patch file to distribute a Dolibarr mod.
* perl:
Tool to install dolibarr when using virtualmin pro
* rpm:
To build Redhat, Opensuse or Mandriva package.
* tgz:
To build a tgz package.
* travis-ci:
Used by travis to make CI.
* zip:
To build a zip package.
* dmg:
To build dmg DoliMamp package for Mac OS X

78
build/README-FR Normal file
View File

@@ -0,0 +1,78 @@
README (French)
################################
Building packages
################################
Les sous repertoires du repertoire "build" contiennent tous les fichiers
requis pour packager Dolibarr de maniere automatisee.
On trouve plusieurs outils:
- Pour construire un package Dolibarr complet, il suffit de
> Editer la version dans le fichier makepack-dolibarr.pl
> Lancer la commande perl makepack-dolibarr.pl
- Pour construire un package d'une traduction, il suffit de lancer le script
> perl makepack-dolibarrlang.pl
- Pour construire un package d'un theme, il suffit de lancer le script
> perl makepack-dolibarrtheme.pl
- Pour construire un package d'un module, il suffit de lancer le script
> perl makepack-dolibarrmodule.pl
- Pour construire un package DoliWamp autoexe:
> Installer InnoSetup (http://www.jrsoftware.org)
> Installer WampServer dans "C:\Program Files\Wamp" (http://www.wampserver.com)
> Installer les addon WampServer afin d'y mettre les versions:
Apache2.2.6, Mysql5.0.45, Php5.2.5
> Modifier dans le fichier build/exe/doliwamp.iss la variable SourceDir
afin d'y mettre le repository Dolibarr.
> Modifier AppVerName et OutputBaseFilename.
> Lancer innosetup, ouvrir le fichier build/exe/doliwamp.iss et cliquer sur
le bouton "Compile". Le fichier .exe sera fabrique dans le repertoire build.
- Pour generer la documentation developpeur, lancer le script
> perl dolybarr-doxygen-build.pl
Note:
Le repertoire build et tout ce qu'il contient n'est absolument pas requis
pour faire fonctionner Dolibarr. Ils ne servent qu'a la generation des
packages. Certains packages, une fois construit, n'incluent par le repertoire
"build".
On trouve dans le repertoire "build", les sous-repertoires utilises par
l'outil makepack-dolibarr.pl:
* deb:
Fichier de config pour construire un package Debian.
* rpm:
Fichier de config pour construire un package Redhat ou Mandrake.
* tgz:
Fichier de config pour construire un package tgz.
* exe:
Fichier de config pour construire un package exe pour Windows des sources
ou pour construire l'assistant d'installation complet DoliWamp.
* zip:
Fichier de config pour construire un package zip.
* live:
Fichier pour fabriquer un live CD de demo de Dolibarr.
* patch:
Fichier exemple de generation de fichier patch pour diffusion d'une
modification de Dolibarr.
* doap:
Fichier descriptif DOAP pour promouvoir/decrire la version de Dolibarr.
* pad:
Fichier descriptif PAD pour promouvoir/decrire la version de Dolibarr.
* dmg:
Fichier de config pour construire un package dmg DoliMamp pour Mac OS X

123
build/aps/APP-META-1.1.xml Executable file
View File

@@ -0,0 +1,123 @@
<!-- Application namespaces and APS version (step 9) -->
<application xmlns="http://apstandard.com/ns/1" version="1.1">
<!-- Application common properties (step 9) -->
<name>Dolibarr ERP-CRM</name>
<version>__VERSION__</version>
<release>__RELEASE__</release>
<homepage>http://www.dolibarr.org/</homepage>
<vendor>
<name>Dolibarr</name>
<homepage>http://www.dolibarr.org/</homepage>
<icon path="images/appicon_64.png" />
</vendor>
<packager>
<name>Laurent Destailleur</name>
<homepage>http://www.nltechno.com</homepage>
<uri>uuid:e743ee30-9fe8-11e0-a32e-0025115d642c</uri>
</packager>
<presentation>
<summary>Dolibarr ERP-CRM, the easy to use software to manage small or medium companies, freelancers or foundations</summary>
<description>
Dolibarr is a free modular software (you see only
features you need) to manage small and medium companies, freelancers
or foundations.
This OpenSource software is designed to provide all features you need to
manage information on many aspects of your business
into an intuitive and user-friendly graphical interface
It's an OpenSource software you can install on a web server or as a
standalone software. Dolibarr is designed to provide simplicity to end-user.
</description>
<icon path="images/appicon_64.png" />
<screenshot path="images/dolibarr_screenshot1_640x480.png">
<description>Screenshot 1</description>
</screenshot>
<changelog>
<version version="3.1.0" release="0">
<entry>See http://www.dolibarr.org/files/ChangeLog</entry>
</version>
</changelog>
<categories>
<category>Back office/Billing</category>
<category>Back office/Accounting and Financial</category>
<category>Back office/Customer Relationship Management</category>
<category>Back office/Enterprise Resource Planning</category>
</categories>
<languages>
<language>en</language>
<language>fr</language>
<language>es</language>
<language>de</language>
<language>pt</language>
</languages>
</presentation>
<upgrade match="/application/version = '3.0'" />
<!-- Application service (step 4) -->
<service id="dolibarr">
<!-- Service presentation properties (step 7) -->
<license must-accept="false">
<text>
<name>GPLv2</name>
<file>COPYING</file>
</text>
</license>
<presentation>
<name>Dolibarr instance</name>
<summary>Dolibarr services</summary>
<entry-points>
<entry class="frontpage" dst="/">
<label>Application entry point</label>
</entry>
</entry-points>
</presentation>
<!-- Service settings (step 7) -->
<settings>
<!--
<group>
<name>Administrator's preferences</name>
<setting id="admin_name" type="string" default-value="admin"
min-length="1" max-length="32" regex="^[a-zA-Z][0-9a-zA-Z_\-]*">
<name>Administrator's login</name>
<error-message>
Please make sure the text you entered starts with a letter and continues with either numbers, letters, underscores or hyphens.
</error-message>
</setting>
<setting id="admin_password" type="password" min-length="1">
<name>Password</name>
</setting>
</group>
-->
</settings>
<!-- Service used technologies (step 6) -->
<requirements xmlns:php="http://apstandard.com/ns/1/php"
xmlns:db="http://apstandard.com/ns/1/db">
<php:version min="4.2.0" />
<php:extension>mysql</php:extension>
<php:extension>mbstring</php:extension>
<php:safe-mode>false</php:safe-mode>
<db:db>
<db:id>main</db:id>
<db:default-name>dolibarr</db:default-name>
<db:can-use-tables-prefix>false</db:can-use-tables-prefix>
<db:server-type>mysql</db:server-type>
<db:server-min-version>4.3.1</db:server-min-version>
</db:db>
</requirements>
<!-- Content delivery settings (step 8) -->
<provision>
<url-mapping>
<default-prefix>dolibarr</default-prefix>
<installed-size>35000000</installed-size>
<mapping url="/" path="htdocs" xmlns:php="http://apstandard.com/ns/1/php">
<php:handler>
<php:extension>php</php:extension>
</php:handler>
</mapping>
</url-mapping>
<!-- Service configuration script declaration (step 10) -->
<configuration-script name="configure.php">
<configuration-script-language>php</configuration-script-language>
<status-control/>
</configuration-script>
</provision>
</service>
</application>

121
build/aps/APP-META-1.2.xml Executable file
View File

@@ -0,0 +1,121 @@
<!-- Application namespaces and APS version (step 9) -->
<application xmlns="http://apstandard.com/ns/1" version="1.2">
<!-- Application common properties (step 9) -->
<id>dolibarr</id>
<name>Dolibarr</name>
<version>__VERSION__</version>
<release>__RELEASE__</release>
<homepage>http://www.dolibarr.org/</homepage>
<vendor>
<name>Dolibarr</name>
<homepage>http://www.dolibarr.org/</homepage>
<icon path="images/appicon_64.png" />
</vendor>
<packager>
<name>Laurent Destailleur</name>
<homepage>http://www.nltechno.com</homepage>
<uri>uuid:e743ee30-9fe8-11e0-a32e-0025115d642c</uri>
</packager>
<presentation>
<summary>Dolibarr ERP - CRM, the easy to use software to manage small or medium companies, freelancers or foundations</summary>
<description>
Dolibarr is a free modular software (you see only
features you need) to manage small and medium companies, freelancers
or foundations.
This OpenSource software is designed to provide all features you need to
manage information on many aspects of your business
into an intuitive and user-friendly graphical interface
It's an OpenSource software you can install on a web server or as a
standalone software. Dolibarr is designed to provide simplicity to end-user.
</description>
<icon path="images/appicon_64.png" />
<screenshot path="images/dolibarr_screenshot1_640x480.png">
<description>Screenshot 1</description>
</screenshot>
<changelog>
<version version="3.1.0" release="0">
<entry>See http://www.dolibarr.org/files/ChangeLog</entry>
</version>
</changelog>
<categories>
<category>Back office/Billing</category>
<category>Back office/Accounting and Financial</category>
<category>Back office/Customer Relationship Management</category>
<category>Back office/Enterprise Resource Planning</category>
</categories>
<languages>
<language>en</language>
<language>fr</language>
<language>es</language>
<language>de</language>
<language>pt</language>
</languages>
</presentation>
<upgrade match="/application/version = '3.0'" />
<!-- Application service (step 4) -->
<service id="dolibarr">
<!-- Service presentation properties (step 7) -->
<license must-accept="false">
<text xml:lang="">
<name>GPLv2</name>
<file>COPYING</file>
</text>
</license>
<presentation>
<name>Dolibarr instance</name>
<entry-points>
<entry class="frontpage" dst="/">
<label>Application entry point</label>
</entry>
</entry-points>
</presentation>
<!-- Service settings (step 7) -->
<settings>
<group>
<name>Administrator's preferences</name>
<setting id="admin_name" type="string" default-value="admin"
min-length="1" max-length="32" regex="^[a-zA-Z][0-9a-zA-Z_\-]*">
<name>Administrator's login</name>
<error-message>
Please make sure the text you entered starts with a letter and continues with either numbers, letters, underscores or hyphens.
</error-message>
</setting>
<setting id="admin_password" type="password" min-length="1">
<name>Password</name>
</setting>
</group>
</settings>
<!-- Service used technologies (step 6) -->
<requirements xmlns:php="http://apstandard.com/ns/1/php"
xmlns:db="http://apstandard.com/ns/1/db">
<php:version min="4.2.0" />
<php:extension>mysql</php:extension>
<php:extension>mbstring</php:extension>
<php:safe-mode>false</php:safe-mode>
<db:db>
<db:id>main</db:id>
<db:default-name>dolibarr</db:default-name>
<db:can-use-tables-prefix>false</db:can-use-tables-prefix>
<db:server-type>mysql</db:server-type>
<db:server-min-version>4.3.1</db:server-min-version>
</db:db>
</requirements>
<!-- Content delivery settings (step 8) -->
<provision>
<url-mapping>
<default-prefix>dolibarr</default-prefix>
<installed-size>35000000</installed-size>
<mapping url="/" path="htdocs" xmlns:php="http://apstandard.com/ns/1/php">
<php:handler>
<php:extension>php</php:extension>
</php:handler>
</mapping>
</url-mapping>
<!-- Service configuration script declaration (step 10) -->
<configuration-script name="configure.php">
<script-language>php</script-language>
<status-control/>
</configuration-script>
</provision>
</service>
</application>

View File

@@ -0,0 +1,89 @@
<html><head>
<title> Limitations of APS Support in the Panel </title>
<meta name="Keywords" content="">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" type="text/css" href="Limitations%20of%20APS%20Support%20in%20the%20Panel_fichiers/stylesheet.css">
<link href="Limitations%20of%20APS%20Support%20in%20the%20Panel_fichiers/prettify.css" type="text/css" rel="stylesheet">
<script type="text/javascript" src="Limitations%20of%20APS%20Support%20in%20the%20Panel_fichiers/prettify.js"></script>
<script src="Limitations%20of%20APS%20Support%20in%20the%20Panel_fichiers/highlight.js"></script></head>
<body onload="prettyPrint()" link="#0000A0" text="#000000" vlink="#FF0000" alink="#008000" bgcolor="#FFFFFF">
<h1 class="heading1">Limitations of APS Support in the Panel</h1>
<h2 class="heading2">About This Document</h2>
<p class="bodytext">This document is addressed to independent software
vendors who plan to distribute web applications among the Panel users.
The aim of the document is to help vendors find out whether they can
package their applications to APS to make them available through the
Panel.</p>
<p class="bodytext">The document does not contain information about
Application Packaging Standard itself or give application packaging
instructions. It focuses on how the Panel implements APS and what APS
packages are not supported by this implementation.</p>
<p class="bodytext"></p>
<h2 class="heading2">APS Support in the Panel</h2>
<p class="bodytext"><em class="emphasis"><em class="emphasis">Application Packaging Standard</em></em> (<em class="emphasis">APS</em>)
is a set of rules that defines a web application packaging format. This
standard is designed to ease the integration of applications in a
service provider's infrastructure. It covers provisioning, management,
and integration of cloud-based services and applications.</p>
<p class="bodytext">The Panel uses APS to offer third-party applications to hosting customers. These applications are presented in <em class="emphasis">APS catalog</em>, where the customers can buy or download them.</p>
<p class="bodytext">Currently, the Panel does not support all aspects of
APS. Therefore, customers may have problems trying to install certain
applications. To find out whether your application is compatible with
the Panel, see section <strong class="specialbold"><strong class="specialbold">Plesk Panel Restrictions.</strong></strong></p>
<p class="bodytext">You can find more information about APS at http://www.apsstandard.org/.</p>
<p class="bodytext">APS specification and supporting documents are available at http://www.apsstandard.org/isv/documentation/.</p>
<p class="bodytext"></p>
<h2 class="heading2">Restrictions on Packages Processing</h2>
<p class="bodytext">The current Panel version has restrictions on APS
applications processing. If an application requires performing
restricted actions, the Panel will not install it. Particularly, these
actions are the following:</p>
<ul class="listbullet"><li class="listbullet">Sending e-mails or processing incoming mail.<p class="listcontinue">See <strong class="specialbold">Mail aspect</strong> of APS in <strong class="specialbold">APS Format Specification v1.2</strong>, section <strong class="specialbold">8.8. Mail </strong>at http://www.apsstandard.org/r/doc/package-format-specification-1.2/index.html#s.aspects.mail</p>
</li><li class="listbullet">Changing the DNS resource records of an environment where the application works.<p class="listcontinue">See <strong class="specialbold">DNS aspect</strong> in <strong class="specialbold">APS Format Specification v1.2</strong>, section <strong class="specialbold">8.10. DNS Zone </strong>at http://www.apsstandard.org/r/doc/package-format-specification-1.2/index.html#s.aspects.dns</p>
</li><li class="listbullet">Installing third-party dynamic libraries (*.dll, *.so).<p class="listcontinue">See<strong class="specialbold"> DLL aspect</strong> in <strong class="specialbold">APS Format Specification v1.2</strong>, section <strong class="specialbold">8.11. DLL Content Processing Method </strong>at http://www.apsstandard.org/r/doc/package-format-specification-1.2/index.html#s.aspects.dll</p>
</li><li class="listbullet">Updating older version of application with
complex changes in application settings or deployment logic. According
to APS, such updates are called <em class="emphasis">upgrades. </em>For more information on the application updates, see the <strong class="specialbold">APS Format Specification v1.2</strong>, section <strong class="specialbold">5.1.15 Updates </strong>at http://www.apsstandard.org/r/doc/package-format-specification-1.2/index.html#s.metadata.common.update</li></ul><p class="bodytext">If
you need you application to perform these actions, consider other ways
of integration with the Panel: API RPC, modules or Panel Notifications.</p>
<p class="bodytext">Also, the Panel does not support the following actions defined in the application package: </p>
<ul class="listbullet"><li class="listbullet">Checking application settings for consistency via <strong class="specialbold">verification script. </strong>For more information on verification scripts, see the <strong class="specialbold">APS Format Specification v1.2</strong>, section <strong class="specialbold">5.3.3 Verification Script </strong>at http://www.apsstandard.org/r/doc/package-format-specification-1.2/index.html#s.metadata.provision.verification-script</li><li class="listbullet">Processing application resource usage reports defined by <strong class="specialbold">resource counters</strong> and passed by <strong class="specialbold">resource script</strong> . For more information on resource counters and resource scripts, see the <strong class="specialbold">APS Format Specification v1.2</strong>, section <strong class="specialbold">5.2.6. Resources</strong> at http://www.apsstandard.org/r/doc/package-format-specification-1.2/index.html#s.metadata.service.resources and <strong class="specialbold">5.3.3 Resources Script </strong>at http://www.apsstandard.org/r/doc/package-format-specification-1.2/index.html#s.metadata.provision.resource-script</li>
<h1 class="heading1">Copyright Notice</h1>
<p class="copyright">Parallels Holdings, Ltd.</p>
<p class="copyright">c/o Parallels International GmbH</p>
<p class="copyright">Vordergasse 59</p>
<p class="copyright">CH-Schaffhausen</p>
<p class="copyright">Switzerland</p>
<p class="copyright">Phone:&nbsp;+41-526320-411</p>
<p class="copyright">Fax: +41-52672-2010</p>
<p class="copyright">&nbsp;</p>
<p class="copyright">Copyright © 1999-2011 Parallels Holdings, Ltd. and its affiliates.&nbsp;All rights reserved.&nbsp;</p>
<p class="copyright">&nbsp;</p>
<p class="copyright">This product is protected by United States and
international copyright laws. The product's underlying technology,
patents, and trademarks are listed at
http://www.parallels.com/trademarks.&nbsp;</p>
<p class="copyright">&nbsp;</p>
<p class="copyright">Microsoft, Windows, Windows Server, Windows NT, Windows Vista, and MS-DOS are registered trademarks of Microsoft Corporation.</p>
<p class="copyright">Linux is a registered trademark of Linus Torvalds.</p>
<p class="copyright">Mac is a registered trademark of Apple, Inc.</p>
<p class="copyright">All other marks and names mentioned herein may be trademarks of their respective owners.</p>
<p class="bodytext">
<a target="_blank" title="Send feedback through a web form" href="http://www.parallels.com/en/support/usersdoc/?problemSubject=Feedback+on+Help+Page+" onclick="var u = parent.BODY.location.href;
u = u.replace(/.+\/([^/]+).htm$/,'$1');
u+= '+of+the+'+parent.document.title.replace(/ /g,'+');
this.href+=u;
window.location.reload(false);">Please send us your feedback on this help page.</a></p>
</ul></body></html>
<!-- Edited by post-publisher -->

View File

@@ -0,0 +1,64 @@
function last(href)
{
var ret = href.split("/");
return ret[ret.length-1];
}
function StopProcess()
{
LeftFrame = parent.TOC.document.location.href;
LeftFrame = last(LeftFrame);
if (LeftFrame == "dhtml_search.htm") return 1
else return 0;
}
function highlightTOC(str) {
if (StopProcess()) return;
try {
str = str || parent.BODY.document.location.href;
uri = last(str);
list = parent.TOC.document.getElementsByTagName("a");
for(i=0; i<list.length; i++)
{
if (last(list[i].href) == uri)
{
list[i].style.backgroundColor = "#6697cc";
list[i].style.padding = "2px";
list[i].style.color = "#ffffff";
} else {
list[i].style.backgroundColor = "#ffffff";
list[i].style.color = "#003380";
}
}
} catch (e) {}
}
function FindCorrectTOCPage()
{
if (StopProcess()) return;
//Updated on 30.04.2008
list = parent.BODY.document.getElementsByTagName("a") || document.getElementsByTagName("a");
for(i=0; i<list.length; i++)
{
if (list[i].target == "TOC")
{
if (last(list[i].href) != last(parent.TOC.document.location.href))
{
parent.TOC.document.location.href = list[i].href;
return;
}
}
}
}

View File

@@ -0,0 +1,60 @@
/* Pretty printing styles. Used with prettify.js. */
.str { color: #FF0000; }
.vr { color: #0000FF; }
.kwd { color: #000080; font-weight: bold}
.com { color: #EA8110; }
.typ { color: #606; }
.lit { color: #066; }
.pun { color: #660; }
.pln { color: #000; }
.tag { color: #008; }
.atn { color: #606; }
.atv { color: #080; }
.dec { color: #606; }
pre.preformatted {
display: block;
font-family: "Courier New", verdana, arial, helvetica, sans-serif;
font-style: normal;
font-variant: normal;
font-weight: normal;
font-size: 10pt;
color: #000000;
background-color: #f4f4f4;
word-spacing: normal;
letter-spacing: normal;
vertical-align: baseline;
text-decoration: none;
text-transform: none;
line-height: normal;
margin-top: 0pt;
margin-bottom: 0pt;
margin-left: 0pt;
margin-right: 6pt;
padding-top: 1pt;
padding-bottom: 1pt;
padding-left: 5pt;
padding-right: 5pt;
float: none;
clear: none;
text-align: left;
text-indent: 0cm;
width: auto;
height: auto;
}
@media print {
.vr { color: #f0f; }
.str { color: #060; }
.kwd { color: #006; font-weight: bold; }
.com { color: #600; font-style: italic; }
.typ { color: #404; font-weight: bold; }
.lit { color: #044; }
.pun { color: #440; }
.pln { color: #000; }
.tag { color: #006; font-weight: bold; }
.atn { color: #404; }
.atv { color: #060; }
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

20
build/aps/README Executable file
View File

@@ -0,0 +1,20 @@
README (English)
##################################################
This directory is dedicated to APS package building
##################################################
Docs for APS format 1.1:
http://www.apsstandard.org/r/doc/aps-format-1.1-packaging-guide/index.htm
Docs for APS format 1.2 (need APP-LIST.xml):
http://www.apsstandard.org/r/doc/aps-format-1.2-packaging-guide/index.htm
To check an APS package on Debian:
* Install libgdiplus with
apt-get install libgdiplus
* Install apslint.exe (http://www.apsstandard.org/r/doc/aps-format-1.2-packaging-guide/57414.htm)
tar -xvf xxxx.tgz
* Go into directory of apslint and run command
mono ./apslint.exe '/media/DATA/Mes Developpements/dolibarr/build/dolibarr-3.1.0-dev.app.zip'

152
build/aps/configure.php Executable file
View File

@@ -0,0 +1,152 @@
#!/usr/bin/php
<?php
/*-----------------------------------------------------
*
*----------------------------------------------------- */
// This is list of predefined variables when script is ran
// We have to set them manually to run script outside context.
/*putenv('SETTINGS_admin_name=admin');
putenv('SETTINGS_admin_password=admin-ad');
putenv('BASE_URL_SCHEME=http');
putenv('BASE_URL_HOST=localhost');
putenv('BASE_URL_PORT=0');
putenv('BASE_URL_PATH=/');
//putenv('WEB___DIR=/var/wwww/dolibarr/htdocs'); // WEB___DIR is dir to htdocs
putenv('WEB___DIR=../htdocs'); // WEB___DIR is dir to htdocs
putenv('DB_main_NAME=dolibarr');
putenv('DB_main_HOST=localhost');
putenv('DB_main_PORT=3306');
putenv('DB_main_LOGIN=root');
putenv('DB_main_PASSWORD=root');
*/
// Check parameters
if(count($_SERVER['argv']) < 2)
{
print "Usage: configure.php (install | upgrade <version> | configure | remove)\n";
exit(1);
}
$command = $_SERVER['argv'][1]; //$command stores the argument with which the script was invoked.
if($command == "install")
{
$db_id = 'main';
$rootdir = getenv("WEB___DIR");
if ($rootdir != '/') $rootdir = preg_replace('/\/$/','',$rootdir); // Remove last /
$datadir = $rootdir.'/dolibarr_documents';
//List of database-related variables that are passed to the configuration
//script. See the 6.3.1.1.1. Environment variables section of the
//Specification for details.
$db_address = getenv("DB_${db_id}_HOST");
$db_port = getenv("DB_${db_id}_PORT");
$dblogin = getenv("DB_${db_id}_LOGIN");
$dbpassword = getenv("DB_${db_id}_PASSWORD");
$dbname = getenv("DB_${db_id}_NAME");
//PHP functions for connecting to the mysql server and
//executing SQL queries.
//mysql_connect($dbaddress, $dblogin, $dbpassword);
//mysql_select_db($dbname);
/*
$sql_queries = file($query_file);
foreach ($sql_queries as $query) mysql_query($query);
*/
//Other code to be executed on invoking configure with
//the install argument.
// Create empty config file
$file=$rootdir.'/conf/conf.php';
print "Create conf file ".$file."\n";
$fp = fopen($file, 'wb');
if ($fp)
{
fclose($fp);
chmod($file,0775);
}
else
{
print "configure.php install: Unable to write file $file.\n";
exit(1);
}
// Create empty directory that will be used by software to store uploaded documents
print "Create directory ".$datadir."\n";
@mkdir($datadir);
chmod($datadir,0775);
// Create install.forced.php into htdocs/install directory with value.
// This will set parameters of install for web installer wizard.
$file_source=$rootdir.'/../build/aps/install.forced.php.install';
$file=$rootdir.'/install/install.forced.php';
print "Create file ".$file.' from '.$file_source."\n";
$modify_hash=array(
'WEB___DIR'=>$rootdir,
'DB_'.$db_id.'_HOST'=>$db_address,
'DB_'.$db_id.'_PORT'=>$db_port,
'DB_'.$db_id.'_LOGIN'=>$dblogin,
'DB_'.$db_id.'_PASSWORD'=>$dbpassword,
'DB_'.$db_id.'_NAME'=>$dbname
);
$file_content = fread(fopen($file_source, 'r'), filesize($file_source));
foreach($modify_hash as $param => $val){
$file_content = str_replace($param, php_quote($val), $file_content);
}
$fp = fopen($file, 'wb');
if ($fp)
{
fputs($fp, $file_content);
fputs($fp, "\n");
fclose($fp);
chmod($file,0775);
}
else
{
print "configure.php install: Unable to write file $file.\n";
exit(2);
}
exit(0);
}
if($command == "remove")
{
//Code to be executed on invoking configure with the remove argument
exit(0);
}
if($command == "upgrade")
{
//Code to be executed on invoking configure with the upgrade argument
exit(0);
}
if($command == "configure")
{
//Code to be executed on invoking configure with the configure argument
exit(0);
}
print "configure.php: Error: unknown command $command.\n";
exit(1);
// Content of file-util.php we need
function php_quote($val)
{
$res_val = str_replace("\\", "\\\\", $val);
$res_val = str_replace("'", "\\'", $res_val);
return $res_val;
}
?>

View File

@@ -0,0 +1,24 @@
<?php
// File to force Dolibarr wizard installer choices.
//
// This file must be present into htdocs/install directory
// during install process to be used.
//
//
$force_install_noedit=1;
$force_install_message='KeepDefaultValuesDeb';
$force_install_main_data_root='WEB___DIR/dolibarr_documents';
$force_install_type='mysqli';
$force_install_dbserver='DB_main_HOST';
$force_install_port='DB_main_PORT';
$force_install_database='DB_main_NAME';
$force_install_createdatabase='0';
$force_install_databaselogin='DB_main_LOGIN';
$force_install_databasepass='DB_main_PASSWORD';
$force_install_createuser='0';
$force_install_databaserootlogin='';
$force_install_databaserootpass='';
$force_install_dolibarrlogin='admin';
$force_install_nophpinfo='1';
$force_install_lockinstall='444';
?>

View File

@@ -1,40 +0,0 @@
--- HOW TO USE COMPOSER
* Switch to the minimal version of PHP
update-alternatives --config php
* To list packages
cd htdocs/includes/diroflib
composer install
composer show -i
* To upgrade a lib with composer using the composer.json of the library only:
Remove entry in composer.lock
cd htdocs/includes/diroflib
rm composer.lock
Edit composer.json to change version to "x.y.z"
composer -v update --root-reqs --no-dev --ignore-platform-reqs
composer -v update --root-reqs --no-dev --ignore-platform-reqs [--no-autoloader] [--dry-run] ccampbell/chromephp
* To upgrade a lib with composer using the composer.json of Dolibarr:
Remove entry in composer.lock
cd /
mv composer.json.disabled composer.json
rm composer.lock
Edit composer.json to change version to "x.y.z"
composer -v update --root-reqs --no-dev --ignore-platform-reqs
composer -v update --root-reqs --no-dev --ignore-platform-reqs [--no-autoloader] [--dry-run] ccampbell/chromephp

View File

@@ -1,13 +0,0 @@
Information about Dolibarr in Debian
------------------------------------
The Debian package provides integration with apache2 and lighttpd.
If you have one of those servers installed, then Dolibarr is immediately
accessible at http://localhost/dolibarr/
But it won't be usable until you configure it via
http://localhost/dolibarr/install/
To complete the setup process you will need the MySQL root credentials
because the Dolibarr installer will create the database and the dedicated user
for you.

View File

@@ -7,442 +7,51 @@ This directory contains files used by makepack-dolibarr.pl
script to build a package, ready to be distributed,
with format .DEB (for Debian, Ubuntu, ...).
##### Prepare linux env to work
# To build a debian package, you need first
# With Ubuntu 12.04
# apt-get install debhelper dpkg-source gpg lintian git-buildpackage pkg-php-tools schroot sbuild dh-linktree dh-make-php
# With Ubuntu 14.04 ou Debian 7
# apt-get install debhelper dpkg gnupg lintian git-buildpackage pkg-php-tools schroot sbuild dh-linktree dh-make-php packaging-dev
# apt-get -i debhelper
# apt-get -i dpkg-source
# apt-get -i gpg
# To generate gpg key for email used into changelog
* Check your existing keys/emails
> gpg --list-key
* Generate a new one, if none exists for email you use as author
> gpg --gen-key Generate a GPG key (-> pubring.gpg + secring.gpg)
Files are saved int .gnupg directory
* Create a file ~/.gpb.conf by
> cat >~/.gbp.conf <<END
[DEFAULT]
pristine-tar = True
[buildpackage]
ignore-branch = True
[git-buildpackage]
sign-tags = True
export-dir = ../build-area/
[git-import-orig]
filter-pristine-tar = True
END
# Complete .bashrc with DEBEMAIL and DEBFULLNAME
Example:
export DEBFULLNAME="Laurent Destailleur (eldy)"
export DEBEMAIL=eldy@users.sourceforge.net
Other example:
export DEBFULLNAME="Laurent Destailleur"
export DEBEMAIL="eldy@destailleur.fr"
export QUILT_PATCHES=debian/patches
# Note: alioth.debian.org is outdated --> https://alioth-archive.debian.org/ --> https://salsa.debian.org/public
* Create an account login
* Update your ~/.ssh/config file to add:
Host svn.debian.org git.debian.org bzr.debian.org hg.debian.org darcs.debian.org arch.debian.org
User eldy-guest
IdentityFile ~/.ssh/id_rsa
* Check login on page https://alioth.debian.org/users/login
Ex: https://alioth.debian.org/users/eldy-guest
* Setup your ssh as described into page: http://wiki.debian.org/Alioth/SSH
* Ask to be included into project collab-maint: http://alioth.debian.org/projects/collab-maint/
##### Some interesting command to know
# To translate .po files
# This is standard command to work on Debian packaging:
#
# gpg --gen-key Generate a GPG key
#
# debconf-updatepo To run into po dir to regenate templates.pot
# podebconf-report-po --from email@email.com To send email to ask translations
# Edit manually file XX.po and remove all lines "#, fuzzy" when translation is complete
# msgfmt -v -c -o /dev/null XX.po To have status of translation for language XX
# To check package integrity
# lintian --pedantic -E -I package.deb To test a binary package
# lintian --pedantic -E -I package.dsc To test a source package
# To manipulate packages
#
# lintian --pedantic -E -I package.deb To test a package
#
# dpkg -l List all packages
# dpkg -b To build binary only package
# dpkg -c package.deb List content of package
# dpkg -I package.deb Give information on package
# dpkg -I package.deb Give informations on package
# dpkg -i package.deb Install a package
# dpkg-reconfigure -plow package Reconfigure package
# dpkg-reconfigure -plow package Reconfigure package
# dpkg -L packagename List content of installed package
# dpkg -r packagename Remove config files and interactive saved answers
# dpkg -s packagename Give status of installed package
# dpkg --purge Remove config files and interactive saved answers
#
# dpkg-buildpackage -us -uc Build a source and binary package
#
# gdebi package.deb Install a package + dependencies
##### Global view of submit new package to Debian:
To submit a package to Debian:
- Post an ITP with reportbugs :
> reportbug -B debian --email username@domain.tld wnpp
See page https://www.debian.org/devel/wnpp/#l1 for example of ITP requests contents.
See page http://www.debian.org/devel/wnpp/#l1 for example of ITP requests contents.
- Wait until you received bug number.
For first ITP submission of Dolibarr, bug id was 634783.
For first ITP submission of Dolibarr, bug id was 634783.
- Check bug is into database by searching with id on
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634783
- Check bug is into database by searching with id on http://www.debian.org/Bugs/
- Add a line for upstream into file changelog with bug number
- Call for a mentor on ML debian-mentors to upload packages
- Once package is uploaded, following URL are available:
https://packages.qa.debian.org/package.html
https://bugs.debian.org/package
##### Modify severity of a bug ticket
- Send this email to control@bugs.debian.org and wait 10 minutes
severity 123 xxx
##### Update bug tracker system
To set status of a bug to "pending"
> bts --smtp-host=yoursmtpserver tag 999999 +pending
or replay to email 999999@bugs.debian.org + submitter of bug
With a message starting with:
Control: tag -1 +pending
Thanks. Fixed into git.
or replay to email control@bugs.debian.org
With only message
tag 729538 +pending
To remove status of a bug without "moreinfo" (bug can be processed)
or replay to email 999999@bugs.debian.org + submitter of bug
With a message starting with:
Control: tag -1 -moreinfo
Thanks. Fixed into git.
or replay to email control@bugs.debian.org
With only message
tag 729538 -moreinfo
##### Testing a package into a chroot environment
Check you have a mysql server available from another interface than "localhost".
Set line in /etc/mysql/my.cnf if required and restart mysql
[mysqld]
bind-address = *
Create a chroot called "jessie" or "unstable".
Chroot env is stored into /srv/chroot directory.
> sudo sbuild-createchroot --keyring=unstable /srv/chroot/unstable http://ftp.uk.debian.org/debian
or
> sudo sbuild-createchroot jessie /srv/chroot/jessie http://ftp.uk.debian.org/debian
Pour lister les env chroot
> schroot -l
or
> ls /srv/chroot
Puis pour se connecter et préparer l'environnement
> schroot -c name_of_chroot (example schroot -c unstable-amd64-sbuild)
> cat /etc/debian_chroot to check which debian branch we are into
> apt-get install vim dialog
> vi /usr/sbin/policy-rc.d and replace return code 101 (not allowed) into 0 (ok)
> apt-get update
> apt-get upgrade
> apt-get install links mysql-client
To test a package
> On host server, stop any server on port 80 and 3306 (same port will be used by chroot env)
> cp ../build-area/* /srv/chroot/unstable/tmp
> sudo schroot -c name_of_chroot
> cd /tmp
> lintian --no-tag-display-limit --pedantic -E -I dolibarr*.deb
> lintian --no-tag-display-limit --pedantic -E -I dolibarr*.dsc
> dpkg -i dolibarr*.deb ou pour avoir des traces: dpkg -D77777 -i dolibarr*.deb
> apt-get install -f
If there is a problem launching apache, because port is already used, change it into your chroot install with
> vi /etc/apache2/ports.conf
Then restart.
Then you can call/test dolibarr with http://localhost:port/dolibarr/ . It can be also called FROM HOST (port must be a not used port on host).
##### Create/Maintain TCPDF package
To update tcpdf package:
* You can git clone tcpdf
> git clone git.debian.org:/git/collab-maint/tcpdf.git [tcpdf-debian]
or better
> mkdir gitdebian
> cd gitdebian
> gbp-clone git.debian.org:/git/collab-maint/tcpdf.git
* You can then create a PHP project from Eclipse called tcpdf-debian
from git clone dir and make link to git.
* If local branch upstream and pristine-tar does not exists, create it
from origin/upstream and origin/pristine.
* Into root dir, launch:
> debian/get-orig-source.sh
If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VERIFY_HOSTNAME=0" to solve this.
* Some files are removed from archive by the get-orig-source.sh
* Modify the tag file to replace sRGB.icc with correct free version and rename file into
tcpdf_x.y.z+dfsgw.orig.tar.xz
(x.y.z = version, w start from 1 and is increased for each new import)
* Staying into git root directory, run
> git-import-orig -vv ../tcpdf_x.y.z+dfsgw.orig.tar.xz --debian-branch=[master|jessie] --upstream-branch=[upstream|upstream-3.5.x]
and enter version when requested with format
x.y.z+dfsgw
(x.y.z = version, w start from 1 and is increased for each new import)
Note: If there was errors solved manually, you may need to make a git commit
* Add an entry into debian/changelog
> dch -v x.y.z+dfsgw-1 "My comment" will add entry.
For example: dch -v x.y.z+dfsgw-1 "New upstream release." for a new version
Then modify changelog to replace "version" or "unstable" with "UNRELEASED".
Warning: Date must have format reported by "date -R"
Warning: Name and email must match value into debian/control file (Entry added here is used by next step).
* We try to build package
> rm -fr ../build-area;
> git-buildpackage -us -uc --git-debian-branch=[master|jessie] --git-upstream-branch=[upstream|upstream-x.y.z]
ou
> git-buildpackage -us -uc --git-ignore-branch --git-upstream-branch=[upstream|upstream-x.y.z]
Note: To build an old version, do: git checkout oldtagname -b newbranchname; git-buildpackage -us -uc --git-debian-branch=newbranchname --git-upstream-branch=[upstream|upstream-3.5.x]
Note: You can use git-buildpackage -us -uc --git-ignore-new if you want to test build with uncommitted file
Note: You can use git-buildpackage -us -uc -d if you want to test build when dependencies does not match
Note: Package is built into directory ../build-area
Note: To compare 2 packages: debdiff package1.dsc package2.dsc
* Test package
> cp ../build-area/* /srv/chroot/unstable/tmp
See rest of process into dedicated chapter "To test a package" to test it with debian unstable env
* If package .deb is ok:
Note: If there was errors managed manually, you may need to make a git commit but do not use option "amend" previous commit
> git push --all ou git push origin --all
* If ok, you can tag.
> Edit debian/changelog to replace "UNRELEASED" into "unstable", then push
> git-buildpackage --git-tag-only --git-retag --git-debian-branch=[master|jessie] --git-upstream-branch=[upstream|upstream-3.5.x]
> git push --tags
* Compilation is then done by a debian developer and sent
> sbuild ...
> dput ...
* Go into page. You should see new package into unstable.
http://packages.qa.debian.org/t/tcpdf.html
* Package will be into release when test will be moved as stable.
##### Create/Maintain dolibarr package
To update dolibarr debian package when upstream (official version of external project) has changed:
* You can git clone debian git repo
> git clone git.debian.org:/git/collab-maint/dolibarr.git [dolibarr-debian]
or better
> cd ~; mkdir git-debian; cd git-debian
> gbp-clone git.debian.org:/git/collab-maint/dolibarr.git
* You can then create a PHP project from Eclipse called dolibarr-debian
from git clone dir and make link to git.
* If local branch upstream and pristine-tar does not exists, create it
from origin/upstream and origin/pristine.
* When new upstream is available onto sourceforge, launch:
> debian/get-orig-source.sh
If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VERIFY_HOSTNAME=0" to solve this.
* Edit orig.tar.gz file to remove
- debian
- htdocs/includes/ckeditor
- htdocs/includes/jquery/css
- htdocs/includes/jquery/js
- htdocs/includes/jquery/plugins/flot
- htdocs/includes/jquery/plugins/multiselect
- htdocs/includes/jquery/plugins/datatables
- htdocs/includes/jszip
- htdocs/includes/mike42
- htdocs/includes/phpoffice
- htdocs/includes/restler/framework/Luracast/Restler/explorer
- htdocs/includes/swiftmailer
- htdocs/includes/tcpdf or htdocs/includes/tecnickcom
And rename file into
dolibarr-x.y.z+dfsgw.tgz
(x.y.z = version, w start from 1 and is increased for each new git-import-orig already done)
* Staying into projet gitted root directory, run
> git-import-orig -vv ../dolibarr-x.y.z+dfsgw.tgz --debian-branch=[master|jessie] --upstream-branch=[upstream|upstream-3.5.x]
and enter version when requested with format
x.y.z+dfsgw
(x.y.z = version, w start from 1 and is increased for each new import)
Note: If there was errors solved manually after get-orig-sources.sh, you may need to make a git commit
* Update/fix debian/* files used to build package.
At least, add an entry into debian/changelog with command
> dch -v x.y.z+dfsgw-1 "My comment"
For example: dch -v x.y.z+dfsgw-1 "New upstream release." for a new version (x.y.z = version, w start from 1 and increased for each new import)
Then check/modify changelog to replace "version" or "unstable" with "UNRELEASED".
Then check/modify also the user/date signature:
- Date must have format reported by "date -R"
- Name and email must match value into debian/control file (Entry added here is used by next step).
To update dolibarr debian package when only files into debian has changed:
* Change files and commit.
* Add a line into changelog for version debian/x.y.z+dfsgw-v (increase the last v into 2, 3...)
> dch -v x.y.z+dfsgw-v "My comment"
* git tag will be added when package is pushed.
To update dolibarr debian package when only files not into debian has changed:
* Checkout the branch you want to work on: master of debian/...
* Manually, add patches into debian/patches and update the file debian/series, or do the 2 steps with "quilt import filepatch.patch"
* You can test patching of series with "quilt push" (autant de fois que de patch). Avec "quilt pop -a", on revient a l'état du upstream sans les patch.
* Update the debian/changelog to add entry of change.
Once files has been prepared, it's time to test:
* Try to build package
> rm -fr ../build-area;
> git-buildpackage -us -uc --git-debian-branch=[master|jessie] --git-upstream-branch=[upstream|upstream-jessie|upstream-3.5.x|3.5.5]
ou
> git-buildpackage -us -uc --git-ignore-branch --git-upstream-branch=[upstream|upstream-jessie|upstream-3.5.x|3.5.5]
Note: To build an old version, do: git checkout oldtagname -b newbranchname; git-buildpackage -us -uc --git-debian-branch=newbranchname --git-upstream-branch=[upstream|upstream-jessie|upstream-3.5.x|3.5.5]
Note: You can use git-buildpackage -us -uc --git-ignore-new if you want to test build with uncommitted file
Note: You can use git-buildpackage -us -uc -d if you want to test build when dependencies does not match
Note: Package is built into directory ../build-area
Note: To compare 2 packages: debdiff package1.dsc package2.dsc
* Test package (see dedicated chapter to test it with debian unstable env)
> sudo rm /srv/chroot/unstable/tmp/* >/dev/null 2>&1; cp ../build-area/* /srv/chroot/unstable/tmp
See rest of process into dedicated chapter "To test a package" to test it with debian unstable env
* If package .deb is ok:
Note: If there was errors managed manually, you may need to make a git commit but do not use option "amend" previous commit
> git push --all
* If ok, you can tag.
> Edit debian/changelog to replace "UNRELEASED" into "unstable", then push
> git-buildpackage --git-tag-only --git-retag --git-debian-branch=[master|jessie] --git-upstream-branch=[upstream|upstream-3.5.x]
> git push --tags
* Compilation is then done by a debian developer and sent
> sbuild ...
> dput ...
* Package arrives into FTPmaster taskboard with status NEW (pending upload). You can view it at:
http://ftp-master.debian.org/new/
* Once package is validated, you should see it into area unstable at:
http://packages.qa.debian.org
* Package will be into release when test will be moved as stable.
##### Send an unblock request to make a full update of a stable package
Use this to move from unstable to testing.
reportbug -B debian --smtphost=smtp.gmail.com:587 --smtpuser=xxxx --smtppasswd=yyyy --tls
Choose package "release.debian.org"
Then usertag "unblock"
Then name of package "dolibarr"
Fill message, for example:
"Please unblock package dolibarr
A security error CVE-2015-3935 was reported and is fixed into package 3.5.7.
Note that package 3.5.7 contains not only fixed for bugs reported to debian. It includes other fixes, but they are all related to stability or security,
so it is a better solution to validate this maintenance release than applying a patch of the only CVE-2015-3935.
After discussion with ..., it appears that security holes are enough to request this unblock request."
Use this to request an full update of a stable package
reportbug -B debian --smtphost=smtp.gmail.com:587 --smtpuser=xxxx --smtppasswd=yyyy --tls
Choose package "release.debian.org"
Then usertag "unblock"
Then name of package "dolibarr"
Fill message, for example:
"
A security error CVE-2015-3935 was reported for Dolibarr ERP CRM package. This bug is fixed into official package 3.5.7 of Dolibarr.
Package 3.5.7 is a maintenance release compared to 3.5.5 and contains only fixes. But not only bugs reported to debian, it includes also other fixes (but they are all related to stability or security).
I think it is a better solution to validate this maintenance release based on the new upstream version of Dolibarr than applying a patch of the only CVE-2015-3935.
Pro are:
- It fixes all debian reported bugs (including security one)
- It fixes also stability bugs
- Patches were already tested because deployed and used by several thousands of users.
- It is easier for package maintener to include this official set of fixes than applying one patch after one patch for each debian report or backported each patch into a dedicated version.
- Debian maintenance version is inline with official project maintenance version (better when all fixes are not related to the way the software is packaged)
Cons are:
- The patch include more than the only one security reported fixes
So I just need to know if it's ok to push such a version 3.5.7 (fixes for 3.5.* branch) instead of only one fix for only the few (the only) reported debian bugs,
since it provides more stability and is for me a more secured process.
"
##### Send an request to ask a simple fix of a stable package
Use this to ask to apply patches on a stable version.
reportbug -B debian --smtphost=smtp.gmail.com:587 --smtpuser=xxxx --smtppasswd=yyyy --tls
Choose package "release.debian.org"
Then usertag "jessie-pu" (if tags is not available in list, choose another one, and change it later into email content text)
Then name of package "dolibarr"
Fill message, for example:
"Please unblock package dolibarr
A security error CVE-2015-3935 was reported and is fixed into package 3.5.7.
Note that package 3.5.7 contains not only fixed for bugs reported to debian. It includes other fixes, but they are all related to stability or security,
so it is a better solution to validate this maintenance release than applying a patch of the only CVE-2015-3935.
After discussion with ..., it appears that security holes are enough to request this unblock request."
Note: If there is a response to ask more information, don't forget to remove the tag during answer.
http://packages.qa.debian.org/package.html
http://bugs.debian.org/package

View File

@@ -0,0 +1,12 @@
==================================================================
Dolibarr - Web based software to manage a small company or foundation
==================================================================
Note for package maintainers
----------------------------
This file explains how to modify official sources (from http://www.dolibarr.org)
to have ready to use source files to build a debian package.
All changes are included into patch file
build/debian/patches

85
build/debian/apache.conf Normal file
View File

@@ -0,0 +1,85 @@
# Apache config file for Dolibarr
<IfModule mod_alias.c>
Alias /dolibarr /usr/share/dolibarr/htdocs
</IfModule>
# You can also use dolibarr as a VirtualHost
# <VirtualHost *:*>
# ServerName mydolibarrhostname.com
# ServerAdmin root@example.com
# DocumentRoot /usr/share/dolibarr/
# ErrorLog logs/ldap.example.com-error.log
# CustomLog logs/ldap.example.com-access.log common
# </VirtualHost>
# Directory for web pages
<DirectoryMatch /usr/share/dolibarr>
Order deny,allow
Allow from all
DirectoryIndex index.php
Options +FollowSymLinks +Indexes
ErrorDocument 401 /public/error-401.php
ErrorDocument 404 /public/error-404.php
<IfModule mod_php4.c>
php_flag magic_quotes_gpc Off
php_flag register_globals Off
</IfModule>
<IfModule mod_php5.c>
php_flag magic_quotes_gpc Off
php_flag register_globals Off
</IfModule>
# OPTIMIZE: To use gzip compressed files (for Dolibarr already compressed files).
# Note that constant MAIN_OPTIMIZE_SPEED must have a value with bit 0 set.
#AddType text/javascript .jgz
#AddEncoding gzip .jgz
# OPTIMIZE: To use gzip compression (on the fly).
# Note that you must also enable the module mod_deflate.
# You can also set this with constant MAIN_OPTIMIZE_SPEED and bit 2 set.
#TODO
# OPTIMIZE: To use cache on static pages (A259200 = 1 month).
# Note that you must also enable the module mod_expires.
#ExpiresActive On
#ExpiresByType image/x-icon A2592000
#ExpiresByType image/gif A2592000
#ExpiresByType image/png A2592000
#ExpiresByType image/jpeg A2592000
#ExpiresByType text/css A2592000
#ExpiresByType text/javascript A2592000
#ExpiresByType application/x-javascript A2592000
#ExpiresByType application/javascript A2592000
</DirectoryMatch>
# Directory for public pages
<DirectoryMatch /usr/share/dolibarr/htdocs/public>
AllowOverride All
Order deny,allow
Allow from all
</DirectoryMatch>
# Config files
<DirectoryMatch /etc/dolibarr>
AllowOverride All
Order deny,allow
Allow from all
</DirectoryMatch>
# Directory for data files
<DirectoryMatch /usr/share/dolibarr/documents>
AllowOverride All
Order deny,allow
Allow from all
</DirectoryMatch>
<DirectoryMatch /var/lib/dolibarr/documents>
AllowOverride All
Order deny,allow
Allow from all
</DirectoryMatch>

View File

@@ -1,21 +0,0 @@
# File used to disable access into directory documents
<IfVersion >= 2.3>
Require all denied
</IfVersion>
<IfVersion < 2.3>
Order deny, allow
Denied from all
</IfVersion>
# OPTIMIZE: To use cache on static pages (A259200 = 1 month, A7200 = 2 hours, A691600 = 8 days = recommended for static resources).
# Note that you must also enable the module mod_expires.
#ExpiresActive On
#ExpiresByType image/x-icon A2592000
#ExpiresByType image/gif A2592000
#ExpiresByType image/png A2592000
#ExpiresByType image/jpeg A2592000
#ExpiresByType text/css A2592000
#ExpiresByType text/javascript A2592000
#ExpiresByType application/x-javascript A2592000
#ExpiresByType application/javascript A2592000

View File

@@ -1,56 +0,0 @@
# Apache config file for Dolibarr
<IfModule mod_alias.c>
Alias /dolibarr /usr/share/dolibarr/htdocs
</IfModule>
# You can also use dolibarr as a VirtualHost
# <VirtualHost *:*>
# ServerName mydolibarrhostname.com
# ServerAdmin root@example.com
# DocumentRoot /usr/share/dolibarr/
# ErrorLog logs/ldap.example.com-error.log
# CustomLog logs/ldap.example.com-access.log common
#
# <IfVersion >= 2.3>
# Require all granted
# </IfVersion>
# <IfVersion < 2.3>
# Order allow,deny
# Allow from all
# </IfVersion>
#
# </VirtualHost>
# Directory for web pages
<Directory /usr/share/dolibarr/htdocs>
<IfVersion >= 2.3>
Require all granted
</IfVersion>
<IfVersion < 2.3>
Order allow,deny
Allow from all
</IfVersion>
DirectoryIndex index.php
Options +FollowSymLinks +Indexes
ErrorDocument 401 /dolibarr/public/error-401.php
ErrorDocument 404 /dolibarr/public/error-404.php
<IfModule mod_php5.c>
php_flag magic_quotes_gpc Off
php_flag register_globals Off
</IfModule>
# OPTIMIZE: To use cache on static pages (A259200 = 1 month).
# Note that you must also enable the module mod_expires.
#ExpiresActive On
#ExpiresByType image/x-icon A2592000
#ExpiresByType image/gif A2592000
#ExpiresByType image/png A2592000
#ExpiresByType image/jpeg A2592000
#ExpiresByType text/css A2592000
#ExpiresByType text/javascript A2592000
#ExpiresByType application/x-javascript A2592000
#ExpiresByType application/javascript A2592000
</Directory>

View File

@@ -1,6 +1,9 @@
dolibarr (__VERSION__) UNRELEASED; urgency=low
dolibarr (3.2.3+nmu1) unstable; urgency=low
[ Laurent Destailleur (eldy) ]
* Non-maintainer upload.
* New upstream release.
closes: bug#634783
-- Laurent Destailleur (eldy) <eldy@users.sourceforge.net> Tue, 12 May 2015 12:00:00 +0100
-- Dolibarr team <contact@dolibarr.org> Mon, 18 Jun 2012 12:00:00 +0100
# For a changelog file dedicated to end users, see /usr/share/doc/dolibarr/ChangeLog.gz

View File

@@ -1 +1 @@
10
7

19
build/debian/conf.php.install Normal file → Executable file
View File

@@ -100,8 +100,9 @@ $dolibarr_main_db_pass='';
# This parameter contains the name of the driver used to access your
# Dolibarr database.
# Default value: none
# Possible values: mysqli, pgsql
# Possible values: mysql, mysqli, pgsql
# Examples:
# $dolibarr_main_db_type='mysql';
# $dolibarr_main_db_type='mysqli';
# $dolibarr_main_db_type='pgsql';
#
@@ -160,11 +161,12 @@ $dolibarr_main_authentication='dolibarr';
# $dolibarr_main_auth_ldap_filter = ''; # If defined, two previous parameters are not used to find a user into LDAP. Ex: (uid=%1%) or &(uid=%1%)(isMemberOf=cn=Sales,ou=Groups,dc=opencsi,dc=com).
# $dolibarr_main_auth_ldap_admin_login=''; # Required only if anonymous bind disabled. Ex: cn=admin,dc=example,dc=com
# $dolibarr_main_auth_ldap_admin_pass=''; # Required only if anonymous bind disabled. Ex: secret
# $dolibarr_main_auth_ldap_debug='false';
# dolibarr_main_demo
# Login and pass to use in a demo mode.
# Login and pass to use in a demo mode
# Default value: ''
# Examples:
# $dolibarr_main_demo='autologin,autopass'
@@ -221,18 +223,9 @@ $dolibarr_main_prod='0';
# $dolibarr_main_limit_users='0';
# dolibarr_mailing_limit_sendbyweb
# Can set a limit for mailing send by web. This overwrite database value. Can be used to restrict on OS level.
# Can set a limit for mailing send by web, can be used for a restricted mode.
# Default value: 0 (use database value if exist)
# Examples:
# $dolibarr_mailing_limit_sendbyweb='0';
# dolibarr_mailing_limit_sendbycli
# Can set a limit for mailing send by cli. This overwrite database value. Can be used to restrict on OS level.
# Default value: 0 (use database value if exist)
# Examples:
# $dolibarr_mailing_limit_sendbycli='0';
# dolibarr_main_distrib
# A key to identify the distribution used for first installation
$dolibarr_main_distrib = 'debian';
?>

63
build/debian/control Normal file → Executable file
View File

@@ -1,52 +1,39 @@
Source: dolibarr
Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
Standards-Version: 3.9.2
Section: web
Priority: optional
Maintainer: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>
# Uploaders: Laurent Destailleur (eldy) <eldy@users.sourceforge.net> # Only if differs from Maintainer
Standards-Version: 3.9.6
Homepage: https://www.dolibarr.org
Build-Depends: debhelper (>= 9), po-debconf
# This package need at least debian 7 or ubuntu 13.04 or any distribution based on this version
Homepage: http://www.dolibarr.org
Build-Depends: debhelper (>= 7), po-debconf, dpatch
Package: dolibarr
Architecture: all
# For debian 7 or 8 or 9
Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5 | libapache2-mod-php | libapache2-mod-phpfilter | php-cgi | php-fpm | php,
php5-cli | php-cli,
# Required PHP extensions
php5-mysql | php5-mysqli | php-mysql | php-mysqli, php5-curl | php-curl, php5-gd | php-gd, php5-ldap | php-gd, php5-zip | php-zip,
# Required PHP libraries
php-pear, php-mail-mime,
# php-tcpdf,
# libfpdf-tpl-php, php-fpdf,
# libnusoap-php,
# libphp-pclzip,
# Required javascript libraries
# javascript-common, libjs-jquery, libjs-jquery-ui, libjs-jquery-flot, ckeditor,
# Misc dependencies
# fonts-dejavu-core | ttf-dejavu-core,
Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5,
php5-mysql | php5-mysqli,
php5-cli, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, php5-geoip,
php-fpdf,
libphp-adodb,
libnusoap-php,
libphp-pclzip,
libjs-jquery, libjs-jquery-ui, ckeditor,
ttf-dejavu-core,
xdg-utils,
mariadb-client | virtual-mysql-client,
mysql-server,
${misc:Depends},
${perl:Depends}
Recommends: apache2 | lighttpd | httpd,
mariadb-server | virtual-mysql-server,
# Required PHP extensions for debian 9 but we can't add them into a Depends, it does not exists on debian 7 and 8
php-xml, php-mbstring, php-intl
Suggests: www-browser, php5-geoip
Description: Web based software to manage a company or foundation
Dolibarr ERP & CRM is an easy to use open source/free software package for
companies, foundations or freelances. It includes different
Recommends: apache2 | lighttpd | httpd, mysql-client
Suggests: www-browser
Architecture: all
Description: Web based software to manage a small company or foundation
Dolibarr ERP & CRM is an easy to use open source/free software for small
and medium companies, foundations or freelances. It includes different
features for Enterprise Resource Planning (ERP) and Customer Relationship
Management (CRM) but also for different other activities.
.
It's a web software you can install as a standalone program or on any web
hosting provider to use it from anywhere with any web browser.
.
Dolibarr was designed to be easy to use. Only the features that you need
are visible, depending on which modules were activated.
.
This is an example of most common used modules:
Dolibarr was designed to be easy to use. Only features you need are
visible, depending on which module were activated.
Most common used modules are:
.
Customers, Suppliers or Prospects directory,
Contacts directory,
@@ -70,6 +57,6 @@ Description: Web based software to manage a company or foundation
Wizards to export and import data,
LDAP connectivity,
PDF exports,
And a lot more modules...
And a lot of more modules...
.
You can also add external modules from third parties or develop yours.
You can also add third parties external modules or develop yours.

54
build/debian/control.debianbin Executable file
View File

@@ -0,0 +1,54 @@
Package: dolibarr
Version: __VERSION__
Architecture: all
Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
Installed-Size: 61200
Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5,
php5-mysql | php5-mysqli,
php5-cli, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, php5-geoip,
libphp-adodb,
libnusoap-php,
libphp-pclzip,
libjs-jquery, libjs-jquery-ui, ckeditor,
ttf-dejavu-core,
xdg-utils,
mysql-server
Section: web
Priority: optional
Homepage: http://www.dolibarr.org
Description: Web based software to manage a small company or foundation
Dolibarr ERP & CRM is an easy to use open source/free software for small
and medium companies, foundations or freelances. It includes different
features for Enterprise Resource Planning (ERP) and Customer Relationship
Management (CRM) but also for different other activities.
It's a web software you can install as a standalone program or on any web
hosting provider to use it from anywhere with any web browser.
.
Dolibarr was designed to be easy to use. Only features you need are
visible, depending on which module were activated.
.
Customers, Suppliers or Prospects directory,
Contacts directory,
Orders management,
Commercial proposals management,
Invoices management,
Products and services catalog,
Stock management,
Foundations members management,
Bank accounts management,
Point of Sale,
Payments management,
Commercial actions management,
Contracts management,
Standing orders management,
Shipping management,
Donations management,
Bookmarks management,
Mass Emailings,
Reports,
Wizards to export and import data,
LDAP connectivity,
PDF exports,
And a lot of more modules...
.
You can also add third parties external modules or develop yours.

View File

@@ -1,14 +1,14 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
Upstream-Name: Dolibarr
Upstream-Contact: Laurent Destailleur <eldy@users.sourceforge.net>
Source: https://www.dolibarr.org/files/stable/standard/
Source: git@github.com:Dolibarr/dolibarr.git
Files: *
Copyright: 2002-2009, Rodolphe Quiedeville <rodolphe@quiedeville.org>
2003-2006, Jean-Louis Bergamo <jlb@j1b.org>
2003-2013, Laurent Destailleur <eldy@users.sourceforge.net>
2003-2012, Laurent Destailleur <eldy@users.sourceforge.net>
2003, Xavier Dutoit <doli@sydesy.com>
2004-2013, Regis Houssin <regis.houssin@inodbox.com>
2004-2012, Regis Houssin <regis@dolibarr.fr>
2004, Sebastien Di Cintio <sdicintio@ressource-toi.org>
2004, Benoit Mortier <benoit.mortier@opensides.be>
2004, Christophe Combelles <ccomb@free.fr>
@@ -31,171 +31,14 @@ Copyright: 2002-2009, Rodolphe Quiedeville <rodolphe@quiedeville.org>
2008, Matteli <unknown@unknown.com>
2008, Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
2010, Francois Legastelois <flegastelois@teclib.com>
2010-2013, Juanjo Menent <jmenent@2byte.es>
2010-2013, Philippe Grand <philippe.grand@atoo-net.com>
2010-2012, Juanjo Menent <jmenent@2byte.es>
2010-2012, Philippe Grand <philippe.grand@atoo-net.com>
2010, Pierre Morin <pierre.morin@auguria.net>
2010, Servitux Servicios Informaticos <info@servitux.es>
2011, Herve Prot <herve.prot@symeos.com>
2011, Remy Younes <ryounes@gmail.com>
2012-2013, Christophe Battarel <christophe.battarel@altairis.fr>
License: GPL-3+
This program is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public
License as published by the Free Software Foundation; either
version 3 of the License, or (at your option) any later
version.
.
This program is distributed in the hope that it will be
useful, but WITHOUT ANY WARRANTY; without even the implied
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the GNU General Public License for more
details.
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
.
On Debian systems, the full text of the GNU General Public
License version 3 can be found in the file
'/usr/share/common-licenses/GPL-3'.
------------------------------------------------------------
Files: htdocs/includes/ckeditor/*
Copyright: 2003-2012 CKSource - Frederico Knabben
2012, Christophe Battarel <christophe.battarel@altairis.fr>
License: GPL-2+
The ckeditor is triple licensed under the GNU General Public License (GPL),
GNU Lesser General Public License (LGPL), and Mozilla Public License (MPL).
In Debian, it is distributed under the GNU General Public License (GPL).
.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
.
On Debian systems, the complete text of the GNU General Public License
can be found in /usr/share/common-licenses/GPL-2 file.
Comment:
Sources for all minified javascript libraries are available in same directory
than minified version (.min.js), except for ckeditor whose sources are files
ckeditor_basic_source.js, ckeditor_source.js and files into directory _source.
Those files are not shipped in the binary package since we use the
library as packaged in "ckeditor".
------------------------------------------------------------
Files: htdocs/includes/fonts/*
Copyright: 2003, Bitstream Inc
unknown, Gavin Graham
License: other
Permission is hereby granted, free of charge, to any person obtaining
a copy of the fonts accompanying this license ("Fonts") and associated
documentation files (the "Font Software"), to reproduce and distribute
the Font Software, including without limitation the rights to use,
copy, merge, publish, distribute, and/or sell copies of the Font
Software, and to permit persons to whom the Font Software is furnished
to do so, subject to the following conditions:
.
The above copyright and trademark notices and this permission notice
shall be included in all copies of one or more of the Font Software
typefaces.
.
The Font Software may be modified, altered, or added to, and in
particular the designs of glyphs or characters in the Fonts may be
modified and additional glyphs or characters may be added to the
Fonts, only if the fonts are renamed to names not containing either
the words "Bitstream" or the word "Vera".
.
This License becomes null and void to the extent applicable to Fonts
or Font Software that has been modified and is distributed under the
"Bitstream Vera" names.
.
The Font Software may be sold as part of a larger software package but
no copy of one or more of the Font Software typefaces may be sold by
itself.
.
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR
OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL,
OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR
OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT
SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
.
Except as contained in this notice, the names of Gnome, the Gnome
Foundation, and Bitstream Inc., shall not be used in advertising or
otherwise to promote the sale, use or other dealings in this Font
Software without prior written authorization from the Gnome Foundation
or Bitstream Inc., respectively. For further information, contact:
fonts at gnome dot org.
Comments:
Those files are not shipped in the binary package as we
configure Dolibarr to use Dejavu fonts from "fonts-dejavu-core".
------------------------------------------------------------
Files: doc/images/*
Copyright: Laurent Destailleur
License: CC-BY-SA-3.0
You are free:
to Share (to copy, distribute and transmit the work) and
to Remix (to adapt the work) under the following conditions:
.
Attribution - You must attribute the work in the manner specified by the
author or licensor (but not in any way that suggests that they endorse you
or your use of the work).
.
Share Alike - If you alter, transform, or build upon this work, you may
distribute the resulting work only under the same, similar or a compatible
license.
.
For more information, see https://creativecommons.org/licenses/by-sa/3.0/
------------------------------------------------------------
Files: htdocs/includes/geoip2/*
Copyright: 2007 MaxMind LLC
License: CC-By-SA
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
.
On Debian systems, the full text of the GNU Lesser General Public
License version 2.1 can be found in the file
'/usr/share/common-licenses/LGPL-2.1'.
------------------------------------------------------------
Files: htdocs/includes/jquery/*
Copyright: JQuery team
https://www.jquery.com
License: GPL-2+ or MIT
=== GPL-2+ LICENSE NOTICE ===
.
This program is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public
License as published by the Free Software Foundation; either
@@ -209,13 +52,57 @@ License: GPL-2+ or MIT
details.
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
along with this program. If not, see <http://www.gnu.org/licenses/>.
.
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
'/usr/share/common-licenses/GPL-2'.
`/usr/share/common-licenses/GPL-2'.
Files: htdocs/includes/fpdi/*
Copyright: FPDFI team
License: GPL-2+
This program is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later
version.
.
=== MIT LICENSE ===
This program is distributed in the hope that it will be
useful, but WITHOUT ANY WARRANTY; without even the implied
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the GNU General Public License for more
details.
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
.
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.
Files: htdocs/includes/jquery/*
Copyright: JQuery team
License: MIT or GPL-2+
This program is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later
version.
.
This program is distributed in the hope that it will be
useful, but WITHOUT ANY WARRANTY; without even the implied
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the GNU General Public License for more
details.
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
.
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.
.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -234,25 +121,14 @@ License: GPL-2+ or MIT
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
Comment:
JQuery itself is not shipped in the binary package, instead Dolibarr is
configured to use the packaged version from "libjs-jquery" and
"libjs-jquery-ui". Most of the plugins are shipped though.
------------------------------------------------------------
Files: htdocs/includes/jquery/plugins/flot/*
Copyright: Flot team
License: Public-Domain
License: Public Domain
This work is not subject to copyright in any jurisdiction
Comment:
Those files are not shipped in the binary package because we configure
Dolibarr to use the files provided by "libjs-flot".
------------------------------------------------------------
Files: htdocs/includes/jsgantt/*
Copyright: JSGantt team
License: GPL-2+
@@ -269,40 +145,18 @@ License: GPL-2+
details.
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
along with this program. If not, see <http://www.gnu.org/licenses/>.
.
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
'/usr/share/common-licenses/GPL-2'.
`/usr/share/common-licenses/GPL-2'.
------------------------------------------------------------
Files: htdocs/includes/phpexcel/*
Copyright: PHPExcel team
License: LGPL 2.1
See http://www.gnu.org/licenses/old-licenses/lgpl-2.1-standalone.html
Files: htdocs/includes/nusoap/*
Copyright: 2002-2010 NuSphere Corporation
License: LGPL-2.1+
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
.
On Debian systems, the full text of the GNU Lesser General Public
License version 2.1 can be found in the file
'/usr/share/common-licenses/LGPL-2.1'.
Comment:
Those files are not shipped in the binary package since we
configure Dolibarr to use the library provided in "libnusoap-php".
------------------------------------------------------------
Files: htdocs/includes/odtphp/*
Copyright: 2008, Julien Pauli
@@ -322,33 +176,14 @@ License: GPL-2+
details.
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
along with this program. If not, see <http://www.gnu.org/licenses/>.
.
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
'/usr/share/common-licenses/GPL-2'.
`/usr/share/common-licenses/GPL-2'.
------------------------------------------------------------
Files: htdocs/includes/tecnickcom/*
Copyright: 2002-2013 Nicola Asuni - Tecnick.com LTD
License: LGPL-3.0+
TCPDF is free software: you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
.
TCPDF is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU Lesser General Public License for more details.
.
You should have received a copy of the GNU Lesser General Public License
along with TCPDF. If not, see <https://www.gnu.org/licenses/>.
.
On Debian systems, the complete text of the GNU Lesser General
Public License version 3 can be found in "/usr/share/common-licenses/LGPL-3".
Comment:
Those files are not shipped in the binary package since we configure
Dolibarr to use the library provided by "php-tcpdf".
Files: htdocs/includes/tcpdf/*
Copyright: TCPDF team
License: LGPL 3.0
See http://www.gnu.org/licenses/old-licenses/lgpl-3.0-standalone.html

View File

@@ -2,8 +2,6 @@
# Debian install package run: config, preinst, prerm, postinst, postrm
#
# shellcheck disable=1091,2034
set -e
@@ -50,7 +48,7 @@ echo "Ask for web server to setup"
db_input critical dolibarr/reconfigure-webserver || true
if db_go ; then
okcancel="1"
okcancel="1"
else
okcancel="0"
fi

View File

@@ -22,6 +22,5 @@ Type=Application
Categories=Office
StartupNotify=true
InitialPreference=5
Keywords=erp,crm,billing,customer,supplier,stock,agenda,project,order,shipment
#NoDisplay=true
#OnlyShowIn=GNOME

View File

@@ -0,0 +1,10 @@
Document: dolibarr
Title: Dolibarr ERP & CRM documentation
Author: Dolibarr team
Abstract: This documentation covers the install, use and administration of
Dolibarr ERP & CRM software.
Section: Office
Format: HTML
Index: /usr/share/doc/dolibarr/index.html
Files: /usr/share/doc/dolibarr/*.html

View File

@@ -1 +0,0 @@
README.md

24
build/debian/dolibarr.install Normal file → Executable file
View File

@@ -1,11 +1,13 @@
debian/dolibarr.desktop usr/share/applications/
debian/dolibarr.xpm usr/share/pixmaps/
debian/apache/.htaccess var/lib/dolibarr/documents/
debian/apache/dolibarr.conf etc/apache2/conf-available/
debian/lighttpd/50-dolibarr.conf etc/lighttpd/conf-available/
debian/install.forced.php.install etc/dolibarr/
htdocs usr/share/dolibarr/
scripts usr/share/dolibarr/
doc/install usr/share/doc/dolibarr/
doc/user usr/share/doc/dolibarr/
doc/index.html usr/share/doc/dolibarr/
debian/dolibarr.desktop usr/share/applications
debian/dolibarr.xpm usr/share/pixmaps
ChangeLog usr/share/doc/dolibarr
README usr/share/doc/dolibarr
doc/install usr/share/doc/dolibarr
doc/user usr/share/doc/dolibarr
doc/index.html usr/share/doc/dolibarr
build/debian/apache.conf etc/dolibarr
build/debian/lighttpd.conf etc/dolibarr
build usr/share/dolibarr
dev usr/share/dolibarr
htdocs usr/share/dolibarr
scripts usr/share/dolibarr

11
build/debian/dolibarr.lintian-overrides Normal file → Executable file
View File

@@ -1,10 +1 @@
# We want a www-data group-writable /var/lib/dolibarr/documents/
dolibarr: non-standard-dir-perm var/lib/dolibarr/documents/ 2775 != 0755
# We depend on xdg-utils providing xdg-open and we use that to open an URL
dolibarr: desktop-command-not-in-package usr/share/applications/dolibarr.desktop xdg-open
# We use <IfVersion> to include the correct configuration for each apache version
dolibarr: apache2-deprecated-auth-config Order
dolibarr: apache2-deprecated-auth-config Allow
# Ignore warning required for a good install process
dolibarr: apache2-reverse-dependency-calls-wrapper-script postinst a2enmod
dolibarr: apache2-reverse-dependency-calls-wrapper-script postinst a2enconf
# No overrided lintian rules is this version.

View File

@@ -1,8 +1,6 @@
#!/bin/sh
# postinst script for dolibarr
# shellcheck disable=1091,2086,2154
set -e
# summary of how this script can be called:
@@ -15,70 +13,27 @@ set -e
# <conflicting-package> <version>
# for details, see /usr/share/doc/packaging-manual/
if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
# Needs to be run outside of functions to have access to parameters
. /usr/share/apache2/apache2-maintscript-helper
fi
setup_empty_conf() {
echo Create empty file $config
mkdir -p /etc/dolibarr
touch /etc/dolibarr/conf.php
chown root:www-data /etc/dolibarr/conf.php
chmod 660 /etc/dolibarr/conf.php
}
is_new_upstream_version() {
# $1 can be empty (not installed) and will result in a true value
# for the check
old_version=$(echo "$1" | sed -e 's/-[^-]*$//' -e 's/^[0-9]*://')
new_version=$(dpkg-query -f '${Version}' -W dolibarr | \
sed -e 's/-[^-]*$//' -e 's/^[0-9]*://')
test "$old_version" != "$new_version"
}
enable_install_upgrade_wizard() {
echo Enable install wizard by removing install.lock file if present
rm -f /var/lib/dolibarr/documents/install.lock
}
php_install() {
if which php5enmod >/dev/null 2>&1 ;then
# php5endmod exists for ubuntu only
echo "Enable php module mysqli with php5enmod"
php5enmod mysqli
lighttpd_install() {
if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then
if which lighty-enable-mod >/dev/null 2>&1 ; then
echo "Add link for Lighttpd config file"
ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf
# We enabled it
lighty-enable-mod dolibarr fastcgi-php
else
echo "Lighttpd not installed, skipping"
fi
fi
}
apache_install() {
webserver=$1
# Enable Apache 2 alias module
if which a2enmod >/dev/null 2>&1 ;then
echo "Enable apache module alias with a2enmod"
a2enmod alias
fi
# Enable dolibarr conf
if which a2enconf >/dev/null 2>&1 ;then
# a2enconf exists for ubuntu only
echo "Enable link for Apache config file with a2enconf"
a2enconf dolibarr
else
if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then
echo "Add link for Apache config file"
ln -s /etc/$webserver/conf-available/dolibarr.conf /etc/$webserver/conf.d/dolibarr.conf
fi
fi
}
lighttpd_install() {
if which lighty-enable-mod >/dev/null 2>&1 ; then
echo "Enable lighttpd link for dolibarr config file"
lighty-enable-mod dolibarr fastcgi-php
else
echo "Lighttpd not installed, skipping"
if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then
echo "Add link for Apache config file"
ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf
fi
}
@@ -94,36 +49,24 @@ echo Run the dolibarr postinst script
# Define vars
docdir='/var/lib/dolibarr/documents'
installfileorig="/etc/dolibarr/install.forced.php.install"
installfileorig="/usr/share/dolibarr/build/debian/install.forced.php.install"
installconfig="/etc/dolibarr/install.forced.php"
config="/etc/dolibarr/conf.php"
case "$1" in
configure)
if [ -z "$2" ]; then
echo First install
#setup_empty_conf
else
echo This is not a first install
fi
php_install
apache_install
lighttpd_install
# Remove lock file
if is_new_upstream_version "$2"; then
enable_install_upgrade_wizard
fi
rm -f $docdir/install.lock
# Create document directory for uploaded data files
mkdir -p $docdir
chown -R www-data:www-data $docdir
chmod -R 775 $docdir
chmod -R g+s $docdir
# Create document directory for uploaded data files
mkdir -p $docdir
chown -R www-data:www-data $docdir
chmod -R 775 $docdir
chmod -R g+s $docdir
# Copy install config file (with matching Debian values) into target directory
# Copy install config file (with matching Debian) values into target directory
superuserlogin=''
superuserpassword=''
if [ -f /etc/mysql/debian.cnf ] ; then
@@ -138,25 +81,31 @@ case "$1" in
cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig
fi
chown -R root:www-data $installconfig
chmod -R 660 $installconfig
chmod -R 660 $installconfig
# If a conf already exists and its content was already completed by installer
if [ ! -s $config ] || ! grep -q "File generated by" $config
then
# Create an empty conf.php with permission to web server
setup_empty_conf
#else
echo Create empty file $config
touch $config
chmod -R 660 $config
chown -R root:www-data $config
else
# File already exist. We add params not found.
#echo Add new params to overwrite path to use shared libraries/fonts
##grep -q -c "dolibarr_lib_GEOIP_PATH" $config || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
#grep -q -c "dolibarr_lib_NUSOAP_PATH" $config || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
#grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ] || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
##grep -q -c "dolibarr_lib_TCPDF_PATH" $config || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
#grep -q -c "dolibarr_js_CKEDITOR" $config || [ ! -d "/usr/share/javascript/ckeditor" ] || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
#grep -q -c "dolibarr_js_JQUERY" $config || [ ! -d "/usr/share/javascript/jquery" ] || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
#grep -q -c "dolibarr_js_JQUERY_UI" $config || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
#grep -q -c "dolibarr_js_JQUERY_FLOT" $config || [ ! -d "/usr/share/javascript/flot" ] || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
#grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
echo Add new params to overwrite path to use shared libraries/fonts
grep -q -c "dolibarr_lib_ADODB_PATH" $config || [ ! -d "/usr/share/php/adodb" ] || echo "<?php \$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; ?>" >> $config
grep -q -c "dolibarr_lib_FPDI_PATH" $config || [ ! -d "/usr/share/php/fpdi" ] || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
#grep -q -c "dolibarr_lib_GEOIP_PATH" $config || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
grep -q -c "dolibarr_lib_NUSOAP_PATH" $config || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ] || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
#grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
#grep -q -c "dolibarr_lib_TCPDF_PATH" $config || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
grep -q -c "dolibarr_js_CKEDITOR" $config || [ ! -d "/usr/share/javascript/ckeditor" ] || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
grep -q -c "dolibarr_js_JQUERY" $config || [ ! -d "/usr/share/javascript/jquery" ] || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
grep -q -c "dolibarr_js_JQUERY_UI" $config || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
grep -q -c "dolibarr_js_JQUERY_FLOT" $config || [ ! -d "/usr/share/javascript/flot" ] || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
fi
db_get dolibarr/reconfigure-webserver
@@ -183,7 +132,7 @@ case "$1" in
# Set permissions to web server
chown -R $webuser:$webgroup /usr/share/dolibarr
chown -R root:$webgroup $config
chown -R root:$webgroup $config
done
# Restart web server.
@@ -197,31 +146,31 @@ case "$1" in
# Reload webserver in any case, configuration might have changed
# Redirection of 3 is needed because Debconf uses it and it might
# be inherited by webserver. See bug #446324.
if [ -f /etc/init.d/$webserver ] ; then
if [ -x /usr/sbin/invoke-rc.d ]; then
echo Restart web server $server using invoke-rc.d
# This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...)
invoke-rc.d $webserver reload 3>/dev/null || true
else
echo Restart web server $server using $server reload
/etc/init.d/$webserver reload 3>/dev/null || true
fi
fi
if [ -f /etc/init.d/$webserver ] ; then
if [ -x /usr/sbin/invoke-rc.d ]; then
echo Restart web server $server using invoke-rc.d
# This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...)
invoke-rc.d $webserver reload 3>/dev/null || true
else
echo Restart web server $server using $server reload
/etc/init.d/$webserver reload 3>/dev/null || true
fi
fi
done
echo ----------
echo "Call Dolibarr page http://localhost/dolibarr/ to complete the setup and use Dolibarr."
echo ----------
;;
;;
abort-upgrade|abort-remove|abort-deconfigure)
;;
;;
*)
echo "postinst called with unknown argument $1" >&2
exit 0
;;
;;
esac
#DEBHELPER#

View File

@@ -3,8 +3,6 @@
#
# see: dh_installdeb(1)
# shellcheck disable=1091,2006,2034,2086,2089,2090
#set -e
set +e
@@ -32,8 +30,8 @@ lighttpd_remove() {
fi
# See bug #448682
if [ -h /etc/lighttpd/conf-enabled/50-dolibarr.conf ] ; then
echo "postrm Manually deleting lighttpd/dolibarr configuration link"
rm /etc/lighttpd/conf-enabled/50-dolibarr.conf
echo "postrm Manually deleting lighttpd/dolibarr configuration link"
rm /etc/lighttpd/conf-enabled/50-dolibarr.conf
fi
fi
}
@@ -48,7 +46,7 @@ apache_remove() {
if [ -f /usr/share/debconf/confmodule ]; then
. /usr/share/debconf/confmodule
. /usr/share/debconf/confmodule
fi
db_version 2.0
@@ -64,12 +62,12 @@ lockfile="$docdir/install.lock"
case "$1" in
# Call when we upgrade
# Call when we upgrade
upgrade)
echo "postrm upgrade"
;;
;;
# Call when we uninstall
# Call when we uninstall
remove)
echo "postrm remove"
rm -f $lockfile
@@ -97,9 +95,9 @@ case "$1" in
fi
fi
done
;;
;;
# Call when we uninstall and purge
# Call when we uninstall and purge
purge)
echo "postrm purge"
@@ -160,62 +158,61 @@ case "$1" in
# Define mysqlcmd
if [ -z "$dbserver" ] || [ "$dbserver" = "localhost" ]; then
hostopt=""
dbserver=localhost
dbserver=localhost
else
case "$dbserver" in
:*)
dbsocket=`echo $dbserver | sed -e 's/^://'`
hostopt="-S $dbsocket"
;;
*)
hostopt="-h $dbserver"
;;
esac
case "$dbserver" in
:*)
dbsocket=`echo $dbserver | sed -e 's/^://'`
hostopt="-S $dbsocket"
;;
*)
hostopt="-h $dbserver"
;;
esac
fi
if [ -z "$dbadmpass" ] ; then
log="${log}No password used."
passopt=""
log="${log}No password used."
passopt=""
else
passopt="--password='"`echo "$dbadmpass" | sed -e "s/'/'"'"'"'"'"'"'/g"`"'"
passopt="--password='"`echo "$dbadmpass" | sed -e "s/'/'"'"'"'"'"'"'/g"`"'"
fi
mysqlcmd="mysql $hostopt $passopt -u $dbadmin"
mysqlcmdnopass="mysql $hostopt -u $dbadmin"
# Now run the drop user
# Now run the drop user
if eval $mysqlcmd -f -e "\"DROP USER '$dbuser'@'localhost';\"" ; then
echo postrm Database login $dbuser@localhost removed
else
error="Unable to run $mysqlcmdnopass -f -e \"DROP USER '$dbuser'@'localhost';\""
error="Unable to run $mysqlcmd -f -e \"DROP USER '$dbuser'@'localhost';\""
echo postrm $error
fi
if eval $mysqlcmd -f -e "\"DROP USER '$dbuser'@'%';\"" ; then
echo postrm Database login $dbuser@% removed
else
error="Unable to run $mysqlcmdnopass -f -e \"DROP USER '$dbuser'@'%';\""
error="Unable to run $mysqlcmd -f -e \"DROP USER '$dbuser'@'%';\""
echo postrm $error
fi
# Now run the drop commands
if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
log="${log}Dropping database $dbname."
# Now run the drop commands
if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
log="${log}Droping database $dbname."
if eval $mysqlcmd -f -e "\"DROP DATABASE $dbname;\"" ; then
if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
error="Database $dbname NOT successfully dropped. You have to do it manually."
echo postrm $error
else
status=drop
fi
if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
error="Database $dbname NOT successfully droped. You have to do it manually."
echo postrm $error
else
status=drop
fi
else
error="Unable to run the drop database script."
error="Unable to run the drop database script."
echo postrm $error
fi
else
else
status=nothing
log="${log}Database $dbname already not exists."
fi
fi
echo "postrm Remove directory $docdir"
rm -rf $docdir ;
echo "postrm Remove directory $docdir"
rm -rf $docdir ;
else
echo "postrm Delete of dolibarr database and uploaded files not wanted"
@@ -224,21 +221,21 @@ case "$1" in
rm -rf /etc/dolibarr
# We clean variable (we ignore errors because db_reset can fails if var was never set)
set +e
set +e
db_reset dolibarr/reconfigure-webserver
db_reset dolibarr/postrm
set -e
set -e
#db_purge
;;
;;
failed-upgrade|abort-install|abort-upgrade|disappear)
;;
;;
*)
echo "postrm called with unknown argument $1" >&2
exit 0
;;
;;
esac
#DEBHELPER#

0
build/debian/dolibarr.templates.futur Normal file → Executable file
View File

View File

@@ -1,196 +1,292 @@
/* XPM */
static char * dolibarr_xpm[] = {
"32 32 161 2",
"32 32 257 2",
" c None",
". c #4378AA",
"+ c #4277A8",
"@ c #4175A7",
"# c #3F74A5",
"$ c #3E72A3",
"% c #3D71A2",
"& c #487AA8",
"* c #5A87B0",
"= c #5987B0",
"- c #5986B0",
"; c #5583AE",
"> c #4678A6",
", c #326A9D",
"' c #356C9F",
") c #3B70A1",
"! c #3B6FA0",
"~ c #90ADC9",
". c #000000",
"+ c #800080",
"@ c #000080",
"# c #008080",
"$ c #008000",
"% c #808000",
"& c #800000",
"* c #C0C0C0",
"= c #C0DCC0",
"- c #A6CAF0",
"; c #808080",
"> c #FF00FF",
", c #0000FF",
"' c #00FFFF",
") c #00FF00",
"! c #FFFF00",
"~ c #FF0000",
"{ c #FFFFFF",
"] c #DFE7EF",
"^ c #A6BED4",
"/ c #5683AD",
"( c #346A9D",
"_ c #3A6E9F",
": c #8CAAC7",
"< c #CFDCE8",
"[ c #4B7AA6",
"} c #3A6E9E",
"| c #396D9D",
"1 c #8BA9C6",
"2 c #FEFEFE",
"3 c #6C92B6",
"4 c #376B9C",
"5 c #386B9B",
"6 c #8AA8C5",
"7 c #648CB1",
"8 c #366A9A",
"9 c #89A8C4",
"0 c #FCFCFD",
"a c #356898",
"b c #89A7C3",
"c c #F1F4F8",
"d c #C2D1E0",
"e c #C4D2E0",
"f c #C8D6E3",
"g c #E1E8EF",
"h c #A4BBD1",
"i c #336797",
"j c #346797",
"k c #88A6C2",
"l c #D0DBE6",
"m c #285F91",
"n c #2F6494",
"o c #2E6394",
"p c #2B6192",
"q c #366898",
"r c #A1B9CE",
"s c #2A6091",
"t c #336595",
"u c #88A5C1",
"v c #D0DCE7",
"w c #2C6092",
"x c #2E6193",
"y c #9CB4CB",
"z c #557FA7",
"A c #316493",
"B c #86A4C0",
"C c #D0DCE6",
"D c #2B5F90",
"E c #799AB9",
"F c #306392",
"G c #86A4BF",
"H c #2A5E8E",
"I c #265B8C",
"J c #F2F5F8",
"K c #89A5C0",
"L c #2F6190",
"M c #85A3BE",
"N c #285C8D",
"O c #23588A",
"P c #F7F9FB",
"Q c #86A3BF",
"R c #2E608E",
"S c #85A2BD",
"T c #CFDBE5",
"U c #275B8A",
"V c #3A6995",
"W c #7092B2",
"X c #2C5E8D",
"Y c #84A1BC",
"Z c #CFDAE5",
"` c #26598A",
" . c #245889",
".. c #B1C3D4",
"+. c #46729B",
"@. c #2B5D8B",
"#. c #83A0BB",
"$. c #CEDAE5",
"%. c #235787",
"&. c #265988",
"*. c #255988",
"=. c #215686",
"-. c #376692",
";. c #B3C5D6",
">. c #F3F5F8",
",. c #205585",
"'. c #2A5C8A",
"). c #82A0BA",
"!. c #CEDAE4",
"~. c #467199",
"{. c #C8D5E0",
"]. c #C9D6E1",
"^. c #E7EDF2",
"/. c #94ADC4",
"(. c #285B89",
"_. c #285A88",
":. c #819FB9",
"<. c #527A9F",
"[. c #F9FAFB",
"}. c #275987",
"|. c #275986",
"1. c #819DB8",
"2. c #CED9E3",
"3. c #51799E",
"4. c #567DA0",
"5. c #265785",
"6. c #809DB8",
"7. c #51789D",
"8. c #698AAA",
"9. c #245584",
"0. c #255683",
"a. c #809CB7",
"b. c #CDD8E3",
"c. c #4F779B",
"d. c #EDF1F5",
"e. c #4B7399",
"f. c #235582",
"g. c #235482",
"h. c #819DB7",
"i. c #D2DCE5",
"j. c #4F769B",
"k. c #D7E0E8",
"l. c #7896B2",
"m. c #1B4E7D",
"n. c #225380",
"o. c #36628B",
"p. c #53799C",
"q. c #52789C",
"r. c #477095",
"s. c #2F5D87",
"t. c #6A8BA9",
"u. c #6F8FAD",
"v. c #688AA8",
"w. c #4F769A",
"x. c #235380",
"y. c #1A4D7B",
"z. c #21527E",
"A. c #20507D",
"B. c #1E4F7B",
"C. c #1D4D7A",
"D. c #1B4C78",
". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
"+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ",
"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
"# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # ",
"$ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ ",
"% % % % % % & * = = = = = = - ; > , ' ) % % % % % % % % % % % % ",
"! ! ! ! ! ! ~ { { { { { { { { { { { ] ^ / ( ! ! ! ! ! ! ! ! ! ! ",
"_ _ _ _ _ _ : { { { { { { { { { { { { { { < [ } _ _ _ _ _ _ _ _ ",
"| | | | | | 1 { { { { { { { { { { { { { { 2 { 3 4 | | | | | | | ",
"5 5 5 5 5 5 6 { { { { { { { { { { { { { { { 2 { 7 5 5 5 5 5 5 5 ",
"8 8 8 8 8 8 9 { { { { { { { { { { { { { { { { 2 0 5 8 8 8 8 8 8 ",
"a a a a a a b { { { { { c d e f g { { { { { { { { h i a a a a a ",
"j j j j j j k { { { { { l m n o p q r { { { { { { 0 s j j j j j ",
"t t t t t t u { { { { { v w t t t t x y { { { { { { z t t t t t ",
"A A A A A A B { { { { { C D A A A A A A { { { { { { E A A A A A ",
"F F F F F F G { { { { { l H F F F F F I J { { { { { K F F F F F ",
"L L L L L L M { { { { { l N L L L L L O P { { { { { Q L L L L L ",
"R R R R R R S { { { { { T U R R R R R V { { { { { { W R R R R R ",
"X X X X X X Y { { { { { Z ` X X X X ...{ { { { { { +.X X X X X ",
"@.@.@.@.@.@.#.{ { { { { $.%.&.*.=.-.;.{ { { { { { >.,.@.@.@.@.@.",
"'.'.'.'.'.'.).{ { { { { !.~.{.].^.{ { { { { { { { /.(.'.'.'.'.'.",
"_._._._._._.:.{ { { { { !.<.{ { { { { { { { { 2 [.}._._._._._._.",
"|.|.|.|.|.|.1.{ { { { { 2.3.{ { { { { { { { 2 { 4.|.|.|.|.|.|.|.",
"5.5.5.5.5.5.6.{ { { { { 2.7.{ { { { { { { 2 { 8.9.5.5.5.5.5.5.5.",
"0.0.0.0.0.0.a.{ { { { { b.c.{ { { { { 2 { d.e.f.0.0.0.0.0.0.0.0.",
"g.g.g.g.g.g.h.{ { { { { i.j.{ { { { { k.l.m.g.g.g.g.g.g.g.g.g.g.",
"n.n.n.n.n.n.o.p.q.q.q.q.r.s.t.u.v.w.x.y.n.n.n.n.n.n.n.n.n.n.n.n.",
"z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.",
"A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.",
"B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.B.",
"C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.",
"D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D."};
"] c #FFFBF0",
"^ c #A0A0A4",
"/ c #402000",
"( c #602000",
"_ c #802000",
": c #A02000",
"< c #C02000",
"[ c #E02000",
"} c #004000",
"| c #204000",
"1 c #404000",
"2 c #604000",
"3 c #804000",
"4 c #A04000",
"5 c #C04000",
"6 c #E04000",
"7 c #006000",
"8 c #206000",
"9 c #406000",
"0 c #606000",
"a c #806000",
"b c #A06000",
"c c #C06000",
"d c #E06000",
"e c #008000",
"f c #208000",
"g c #408000",
"h c #608000",
"i c #808000",
"j c #A08000",
"k c #C08000",
"l c #E08000",
"m c #00A000",
"n c #20A000",
"o c #40A000",
"p c #60A000",
"q c #80A000",
"r c #A0A000",
"s c #C0A000",
"t c #E0A000",
"u c #00C000",
"v c #20C000",
"w c #40C000",
"x c #60C000",
"y c #80C000",
"z c #A0C000",
"A c #C0C000",
"B c #E0C000",
"C c #00E000",
"D c #20E000",
"E c #40E000",
"F c #60E000",
"G c #80E000",
"H c #A0E000",
"I c #C0E000",
"J c #E0E000",
"K c #000040",
"L c #200040",
"M c #400040",
"N c #600040",
"O c #800040",
"P c #A00040",
"Q c #C00040",
"R c #E00040",
"S c #002040",
"T c #202040",
"U c #402040",
"V c #602040",
"W c #802040",
"X c #A02040",
"Y c #C02040",
"Z c #E02040",
"` c #004040",
" . c #204040",
".. c #404040",
"+. c #604040",
"@. c #804040",
"#. c #A04040",
"$. c #C04040",
"%. c #E04040",
"&. c #006040",
"*. c #206040",
"=. c #406040",
"-. c #606040",
";. c #806040",
">. c #A06040",
",. c #C06040",
"'. c #E06040",
"). c #008040",
"!. c #208040",
"~. c #408040",
"{. c #608040",
"]. c #808040",
"^. c #A08040",
"/. c #C08040",
"(. c #E08040",
"_. c #00A040",
":. c #20A040",
"<. c #40A040",
"[. c #60A040",
"}. c #80A040",
"|. c #A0A040",
"1. c #C0A040",
"2. c #E0A040",
"3. c #00C040",
"4. c #20C040",
"5. c #40C040",
"6. c #60C040",
"7. c #80C040",
"8. c #A0C040",
"9. c #C0C040",
"0. c #E0C040",
"a. c #00E040",
"b. c #20E040",
"c. c #40E040",
"d. c #60E040",
"e. c #80E040",
"f. c #A0E040",
"g. c #C0E040",
"h. c #E0E040",
"i. c #000080",
"j. c #200080",
"k. c #400080",
"l. c #600080",
"m. c #800080",
"n. c #A00080",
"o. c #C00080",
"p. c #E00080",
"q. c #002080",
"r. c #202080",
"s. c #402080",
"t. c #602080",
"u. c #802080",
"v. c #A02080",
"w. c #C02080",
"x. c #E02080",
"y. c #004080",
"z. c #204080",
"A. c #404080",
"B. c #604080",
"C. c #804080",
"D. c #A04080",
"E. c #C04080",
"F. c #E04080",
"G. c #006080",
"H. c #206080",
"I. c #406080",
"J. c #606080",
"K. c #806080",
"L. c #A06080",
"M. c #C06080",
"N. c #E06080",
"O. c #008080",
"P. c #208080",
"Q. c #408080",
"R. c #608080",
"S. c #808080",
"T. c #A08080",
"U. c #C08080",
"V. c #E08080",
"W. c #00A080",
"X. c #20A080",
"Y. c #40A080",
"Z. c #60A080",
"`. c #80A080",
" + c #A0A080",
".+ c #C0A080",
"++ c #E0A080",
"@+ c #00C080",
"#+ c #20C080",
"$+ c #40C080",
"%+ c #60C080",
"&+ c #80C080",
"*+ c #A0C080",
"=+ c #C0C080",
"-+ c #E0C080",
";+ c #00E080",
">+ c #20E080",
",+ c #40E080",
"'+ c #60E080",
")+ c #80E080",
"!+ c #A0E080",
"~+ c #C0E080",
"{+ c #E0E080",
"]+ c #0000C0",
"^+ c #2000C0",
"/+ c #4000C0",
"(+ c #6000C0",
"_+ c #8000C0",
":+ c #A000C0",
"<+ c #C000C0",
"[+ c #E000C0",
"}+ c #0020C0",
"|+ c #2020C0",
"1+ c #4020C0",
"2+ c #6020C0",
"3+ c #8020C0",
"4+ c #A020C0",
"5+ c #C020C0",
"6+ c #E020C0",
"7+ c #0040C0",
"8+ c #2040C0",
"9+ c #4040C0",
"0+ c #6040C0",
"a+ c #8040C0",
"b+ c #A040C0",
"c+ c #C040C0",
"d+ c #E040C0",
"e+ c #0060C0",
"f+ c #2060C0",
"g+ c #4060C0",
"h+ c #6060C0",
"i+ c #8060C0",
"j+ c #A060C0",
"k+ c #C060C0",
"l+ c #E060C0",
"m+ c #0080C0",
"n+ c #2080C0",
"o+ c #4080C0",
"p+ c #6080C0",
"q+ c #8080C0",
"r+ c #A080C0",
"s+ c #C080C0",
"t+ c #E080C0",
"u+ c #00A0C0",
"v+ c #20A0C0",
"w+ c #40A0C0",
"x+ c #60A0C0",
"y+ c #80A0C0",
"z+ c #A0A0C0",
"A+ c #C0A0C0",
"B+ c #E0A0C0",
"C+ c #00C0C0",
"D+ c #20C0C0",
"E+ c #40C0C0",
"F+ c #60C0C0",
"G+ c #80C0C0",
"H+ c #A0C0C0",
" J.J.J.J.J.J.J.J.J.J.J.J.J.J.J.....-.S.^ * = ",
"S.y+H+y+y+y+y+y+y+y+y+y+y+y+y+y+y+y+R.R.J.J.S.* = ",
"S.R.x+o+Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.o+p+x+x+x+R.R.^ * ",
"S.R.Q.H.G.G.G.G.G.G.G.G.G.G.G.G.G.G.H.H.Q.Q.o+o+R.S.* ",
"S.R.Q.H.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.H.H.Q.Q.Q.`.* ",
"S.R.Q.H.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.H.H.H.H.^ * ",
"S.R.Q.H.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.H.H.H.H+ ",
"S.R.Q.H.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.H.G.I.= ",
"S.R.Q.H.G.G.G.G.G.y.` ` ` ` ` ` y.y.G.G.G.G.G.G.G.G.H.H.G.y+ ",
"S.R.Q.H.G.G.G.G.G.` .=.=.=.=...S S ` y.G.G.G.G.G.G.G.H.G.H. ",
"S.R.o+H.H.H.H.H.G.` ^ * R.` y.H.H.H.H.H.H.H.H.y.H+ ",
"S.R.o+H.H.H.H.H.H.` ^ = H.H.H.H.H.H.H.H.H.G.R. ",
"S.R.o+P.H.H.H.H.H.` ^ * H.H.H.H.H.H.H.H.H.z. ",
"S.p+o+P.H.H.H.H.H.` ^ * o+P.P.H.H.H.H.P.H.` ",
"S.p+o+n+P.P.P.P.H.z.^ * R.o+n+P.P.P.P.P.H.` ",
"S.p+w+n+n+n+n+n+H.z.^ * S.w+n+n+n+n+n+n+H. .* ",
"S.x+w+n+n+n+n+n+P.z.^ ^ R.x+o+n+n+n+n+n+H. .* ",
"S.x+w+n+n+n+n+n+P.H.^ ^ R.x+w+n+n+n+n+n+H. . ",
"S.x+w+n+n+n+n+n+n+H.^ * S.R.x+w+n+n+n+n+n+H. . ",
"S.x+x+w+n+n+n+n+n+H.^ = S...G+F+w+n+n+n+n+n+H. . ",
"S.x+x+w+v+v+v+v+n+H.z+ = * S...S.G+x+w+v+v+v+v+n+H.R. ",
"S.x+x+w+w+w+w+w+n+H.z+ = * ^ ^ S.....`.- G+w+w+w+w+w+w+P. .^ ",
"S.x+F+w+w+w+w+w+w+H.H+= -.....=.J.`.- - G+w+w+w+w+w+w+w+H.T ",
"S.x+F+w+w+w+w+w+w+H.H+* - - - - - - G+F+w+w+w+w+w+w+w+P. .R. ",
"S.x+F+w+w+w+w+w+w+H.H+* - G+F+F+F+F+E+w+w+w+w+w+w+w+w+H. . ",
"S.y+F+E+w+w+w+w+w+H.H+* F+F+w+w+w+w+w+w+w+w+w+w+w+w+H. .^ ",
"S.G+F+E+E+E+E+E+w+P.H+* F+F+E+E+E+E+E+E+E+E+E+E+w+H. .S. ",
"S.G+F+F+E+E+E+E+w+P.H+* G+F+E+E+E+E+E+E+E+E+E+w+H.T S. ",
"S.G+F+F+E+E+E+E+w+Q.H+* G+F+E+E+E+E+E+E+E+w+Q.H.T `. ",
"S.G+G+F+F+F+F+F+E+Q.H+* - F+F+F+E+E+w+w+Q.H. ...* ",
"^ G+F+x+x+x+x+x+Q.I.H+ - F+x+x+Q.Q.I. . .=.z+ ",
" H+I. . . . . . . .^ R... . . .J.S.^ = "};

View File

@@ -1,28 +0,0 @@
#!/bin/sh
# shellcheck disable=2034,2086,2103,2164
tmpdir=$(mktemp -d)
# Download source file
if [ -n "$1" ]; then
uscan_opts="--download-version=$1"
fi
#uscan --noconf --force-download --no-symlink --verbose --destdir=$tmpdir $uscan_opts
cd $tmpdir
# Other method to download (comment uscan if you use this)
wget http://www.dolibarr.org/files/stable/standard/dolibarr-3.5.4.tgz
# Rename file to add +dfsg
tgzfile=$(echo *.tgz)
version=$(echo "$tgzfile" | perl -pi -e 's/^dolibarr-//; s/\.tgz$//; s/_/./g; s/\+nmu1//; ')
cd - >/dev/null
mv $tmpdir/dolibarr-${version}.tgz ../
echo "File ../dolibarr-${version}.tgz is ready for git-import-orig"
rm -rf $tmpdir

31
build/debian/install.forced.php.install Normal file → Executable file
View File

@@ -1,13 +1,13 @@
<?php
// File to force Dolibarr wizard installer choices.
//
// This file must be present into htdocs/install or /etc/dolibarr directory
// This file must be present into htdocs/install directory
// during install process to be used.
//
//
$force_install_packager='deb';
$force_install_noedit=1;
$force_install_noedit=2;
$force_install_message='KeepDefaultValuesDeb';
#$force_install_main_data_root='/usr/share/dolibarr/documents';
$force_install_main_data_root='/var/lib/dolibarr/documents';
@@ -24,18 +24,19 @@ $force_install_databaserootpass='__SUPERUSERPASSWORD__';
$force_install_dolibarrlogin='admin';
$force_install_nophpinfo='1';
$force_install_lockinstall='444';
$force_install_distrib='debian';
// Value to overwrite path to use shared libraries/fonts instead of embedded one.
// If during install, we enable/disable declaration to use non embedded libraries, we must also check they are
// - not removed from package (see rm in rules file),
// - declared into dependencies (see Depends in control file)
//$force_dolibarr_lib_TCPDF_PATH='';
//$force_dolibarr_lib_GEOIP_PATH='';
//$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
//$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';
//$force_dolibarr_js_CKEDITOR='/javascript/ckeditor'; // Use '/javascript/ckeditor' or 'disabled'
//$force_dolibarr_js_JQUERY='/javascript/jquery';
//$force_dolibarr_js_JQUERY_UI='/javascript/jquery-ui';
// Value to overwrite path to use shared libraries/fonts instead of embedded one
$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
//$force_dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi';
$force_dolibarr_lib_GEOIP_PATH='';
$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';
$force_dolibarr_lib_PHPEXCEL_PATH='';
$force_dolibarr_lib_TCPDF_PATH='';
$force_dolibarr_js_CKEDITOR='/javascript/ckeditor';
$force_dolibarr_js_JQUERY='/javascript/jquery';
$force_dolibarr_js_JQUERY_UI='/javascript/jquery-ui';
//$force_dolibarr_js_JQUERY_FLOT='/javascript/flot';
//$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf';
$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf';
?>

View File

View File

@@ -0,0 +1 @@
install.dpatch

View File

@@ -0,0 +1,50 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## install.patch by <eldy@users.sourceforge.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Updates htdocs/filefunc.inc.php
## DP: Updates htdocs/install/inc.php
## DP: Updates htdocs/support/inc.php
@DPATCH@
--- old/htdocs/filefunc.inc.php 2011-09-03 02:32:48.666952000 +0200
+++ new/htdocs/filefunc.inc.php 2011-09-03 02:33:00.510952001 +0200
@@ -64,8 +64,8 @@
$conffile = "conf/conf.php";
$conffiletoshow = "htdocs/conf/conf.php";
// For debian/redhat like systems
-//$conffile = "/etc/dolibarr/conf.php";
-//$conffiletoshow = "/etc/dolibarr/conf.php";
+$conffile = "/etc/dolibarr/conf.php";
+$conffiletoshow = "/etc/dolibarr/conf.php";
// Include configuration
--- old/htdocs/install/inc.php 2011-09-03 02:33:26.450952000 +0200
+++ new/htdocs/install/inc.php 2011-09-03 02:33:36.286952001 +0200
@@ -84,8 +84,8 @@
$conffile = "../conf/conf.php";
$conffiletoshow = "htdocs/conf/conf.php";
// For debian/redhat like systems
-//$conffile = "/etc/dolibarr/conf.php";
-//$conffiletoshow = "/etc/dolibarr/conf.php";
+$conffile = "/etc/dolibarr/conf.php";
+$conffiletoshow = "/etc/dolibarr/conf.php";
if (! defined('DONOTLOADCONF') && file_exists($conffile))
--- old/htdocs/support/inc.php 2011-09-03 02:34:39.606952000 +0200
+++ new/htdocs/support/inc.php 2011-09-03 02:33:59.814952000 +0200
@@ -79,8 +79,8 @@
$conffile = "../conf/conf.php";
$conffiletoshow = "htdocs/conf/conf.php";
// For debian/redhat like systems
-//$conffile = "/etc/dolibarr/conf.php";
-//$conffiletoshow = "/etc/dolibarr/conf.php";
+$conffile = "/etc/dolibarr/conf.php";
+$conffiletoshow = "/etc/dolibarr/conf.php";
$charset="UTF-8"; // If not output format found in any conf file
if (! defined('DONOTLOADCONF') && file_exists($conffile))

View File

@@ -1 +0,0 @@
use-etc-dolibarr-conf.patch

View File

@@ -1,37 +0,0 @@
Description: Enable /etc/dolibarr/conf.php so that we use packaged libraries
Update some PHP include files to refer to /etc/dolibarr/conf.php
instead of the in-tree conf/conf.php.
.
/etc/dolibarr/conf.php configures Dolibarr to use packaged libraries
instead of the embedded ones.
Author: Laurent Destailleur <eldy@users.sourceforge.net>
Forwarded: not-needed
Last-Update: 2013-07-29
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -63,8 +63,8 @@ $conffiletoshowshort = "conf.php";
$conffile = "conf/conf.php";
$conffiletoshow = "htdocs/conf/conf.php";
// For debian/redhat like systems
-//$conffile = "/etc/dolibarr/conf.php";
-//$conffiletoshow = "/etc/dolibarr/conf.php";
+$conffile = "/etc/dolibarr/conf.php";
+$conffiletoshow = "/etc/dolibarr/conf.php";
// Include configuration
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -73,8 +73,8 @@ $conffiletoshowshort = "conf.php";
$conffile = "../conf/conf.php";
$conffiletoshow = "htdocs/conf/conf.php";
// For debian/redhat like systems
-//$conffile = "/etc/dolibarr/conf.php";
-//$conffiletoshow = "/etc/dolibarr/conf.php";
+$conffile = "/etc/dolibarr/conf.php";
+$conffiletoshow = "/etc/dolibarr/conf.php";
$short_options = "c:h";
$long_options = array(

0
build/debian/po/POTFILES.in Normal file → Executable file
View File

16
build/debian/po/fr.po Normal file → Executable file
View File

@@ -14,11 +14,11 @@
msgid ""
msgstr ""
"Project-Id-Version: 1.0\n"
"Report-Msgid-Bugs-To: dolibarr@packages.debian.org\n"
"POT-Creation-Date: 2013-04-23 12:16+0200\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-08-01 18:17+0200\n"
"PO-Revision-Date: 2011-07-29 22:45+0100\n"
"Last-Translator: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>\n"
"Language-Team: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>\n"
"Last-Translator: Laurent Destailleur <eldy@users.sourceforge.net>\n"
"Language-Team: Laurent Destailleur <eldy@users.sourceforge.net>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
@@ -27,13 +27,13 @@ msgstr ""
#. Type: multiselect
#. Description
#: ../dolibarr.templates:1001
#: ../templates:1001
msgid "Web server to reconfigure automatically:"
msgstr "Seveur web à reconfigurer automatiquement:"
#. Type: multiselect
#. Description
#: ../dolibarr.templates:1001
#: ../templates:1001
msgid ""
"Please choose the web server that should be automatically configured to run "
"dolibarr."
@@ -44,14 +44,14 @@ msgstr ""
#
#. Type: boolean
#. Description
#: ../dolibarr.templates:2001
#: ../templates:2001
msgid "Delete database and uploaded files ?"
msgstr "Effacer la base de donnée et les fichiers uploadés ?"
#
#. Type: boolean
#. Description
#: ../dolibarr.templates:2001
#: ../templates:2001
msgid ""
"Answer if you want to removed the Dolibarr MySQL database and all other "
"datas (datas related to this question are the Dolibarr DBMS account, all "

15
build/debian/po/templates.pot Normal file → Executable file
View File

@@ -3,12 +3,11 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: dolibarr\n"
"Report-Msgid-Bugs-To: dolibarr@packages.debian.org\n"
"POT-Creation-Date: 2013-04-23 12:16+0200\n"
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-08-01 18:17+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,13 +18,13 @@ msgstr ""
#. Type: multiselect
#. Description
#: ../dolibarr.templates:1001
#: ../templates:1001
msgid "Web server to reconfigure automatically:"
msgstr ""
#. Type: multiselect
#. Description
#: ../dolibarr.templates:1001
#: ../templates:1001
msgid ""
"Please choose the web server that should be automatically configured to run "
"dolibarr."
@@ -33,13 +32,13 @@ msgstr ""
#. Type: boolean
#. Description
#: ../dolibarr.templates:2001
#: ../templates:2001
msgid "Delete database and uploaded files ?"
msgstr ""
#. Type: boolean
#. Description
#: ../dolibarr.templates:2001
#: ../templates:2001
msgid ""
"Answer if you want to removed the Dolibarr MySQL database and all other "
"datas (datas related to this question are the Dolibarr DBMS account, all "

View File

@@ -4,35 +4,32 @@
export DH_VERBOSE=1
export DH_OPTIONS=-v
#export DH_COMPAT=7 # This is the debhelper compatibility version to use, now defined into compat file
#export DH_COMPAT=7 # This is the debhelper compatability version to use, now defined into compat file
%:
# use dpatch
include /usr/share/dpatch/dpatch.make
configure:
dh $@
# Replace standard debian package actions with a new one
########################################################
build: patch
dh $@
override_dh_auto_clean:
# Do nothing. Added to disable launchpad to use bugged dh_auto_clean search for ant
build-arch: patch
dh $@
override_dh_auto_build:
# Do nothing. Added to disable launchpad to use bugged dh_auto_build search for ant
build-indep: patch
dh $@
# Force the compression format for control files
override_dh_builddeb:
dh_builddeb -- -Zxz
binary:
dh $@
#override_dh_compress:
# dh_compress --no-act -X.png
binary-indep:
dh $@
# We disable this for png file because it modify content of original file so make
# the dolibarr signature not valid.
override_dh_strip_nondeterminism:
dh_strip_nondeterminism -X.png
override_dh_install:
dh_install
clean:
# Delete files
rm -f .buildpath
rm -fr .cache
@@ -44,6 +41,7 @@ override_dh_install:
rm -f build.xml
rm -f quickbuild.xml
rm -f pom.xml
rm -f README.md
rm -f htdocs/install/mssql/README
rm -f htdocs/install/mysql/README
@@ -92,40 +90,32 @@ override_dh_install:
rm -fr build/rpm
rm -fr build/zip
# clean from all PHP embedded libraries (we use package dependencies instead)
# rm -fr htdocs/includes/geoip
# rm -fr htdocs/includes/nusoap
# rm -fr htdocs/includes/odtphp/zip/pclzip
# clean from all JS-CSS embedded libraries (we use package dependencies instead)
# rm -fr htdocs/includes/ckeditor
# rm -fr htdocs/includes/jquery/js
# rm -fr htdocs/includes/jquery/css
# clean from all embedded libraries (we use package dependencies instead)
rm -fr htdocs/includes/adodbtime
rm -fr htdocs/includes/ckeditor
# rm -fr htdocs/includes/fpdfi
rm -fr htdocs/includes/fonts
rm -fr htdocs/includes/geoip
rm -fr htdocs/includes/nusoap
rm -fr htdocs/includes/odtphp/zip/pclzip
rm -fr htdocs/includes/jquery/css
rm -fr htdocs/includes/jquery/js
# rm -fr htdocs/includes/jquery/plugins/flot
# clean from all embedded fonts (we use package dependencies instead)
# rm -fr htdocs/includes/fonts
# clean from useless files
rm -fr htdocs/includes/jquery/plugins/jstree
rm -fr htdocs/includes/jquery/plugins/lightbox
rm -fr htdocs/includes/jquery/plugins/mobile
rm -fr htdocs/includes/jquery/plugins/multiselect
rm -fr htdocs/includes/phpexcel/PHPExcel/Shared/PDF
rm -fr htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip
rm -fr htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33
rm -fr htdocs/includes/tcpdf/fonts/freefont-20100919
rm -fr htdocs/includes/tcpdf/fonts/utils
# clean from files to avoid warning of missing dependencies
rm -fr htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.py
# Licence files are already included into copyright file.
rm -f htdocs/includes/jquery/plugins/flot/LICENSE.txt
# Licence files are included into copyright file.
rm -fr htdocs/includes/phpexcel/license.txt
rm -f htdocs/includes/tcpdf/LICENSE.TXT
# Drop unwanted executable permissions
find debian/dolibarr/usr/share/dolibarr/htdocs -type f -print0 | \
xargs -0 chmod 644
# Add missing executable permissions
find debian/dolibarr/usr/share/dolibarr/scripts -type f -name '*.php' -print0 | \
xargs -0 chmod 755
dh $@
override_dh_fixperms:
dh_fixperms
# Give rights to the webserver on the upload directory
chown www-data:www-data debian/dolibarr/var/lib/dolibarr/documents
chmod 2775 debian/dolibarr/var/lib/dolibarr/documents
binary-arch:

View File

@@ -1 +1 @@
3.0 (quilt)
3.0 (native)

View File

@@ -1,17 +0,0 @@
# Remove warning, we want to keep both standard and minified sources.
dolibarr: source-contains-prebuilt-javascript-object htdocs/includes/jquery/*
dolibarr: source-contains-prebuilt-javascript-object htdocs/includes/jsgantt/*
dolibarr: source-contains-prebuilt-javascript-object htdocs/includes/jstz/*
# Those are false positives, the files are their own sources since
# they are not minified
source-is-missing htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/*.js
source-is-missing htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/*.js
source-is-missing htdocs/includes/ckeditor/ckeditor/lang/*.js
source-is-missing htdocs/includes/ckeditor/ckeditor/plugins/*/dialogs/*.js
source-is-missing htdocs/includes/ckeditor/ckeditor/plugins/*/filter/*.js
source-is-missing htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/default.js
source-is-missing htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/*.js
# Those are false positives, the files are their own sources since
# they are data files
source-is-missing htdocs/includes/mobiledetect/mobiledetectlib/Mobile_Detect.json

View File

@@ -1,5 +0,0 @@
# Force use of gzip compression by dpkg-buildpackage for the tarball *.debian.tar.gz
# See also option --compression from command line of dpkg-buildpackage
# Format for the control files are defined into the rules file in override_dh_builddeb section
compression = "gzip"
#compression-level = 9

3
build/debian/wash Normal file
View File

@@ -0,0 +1,3 @@
# watch control file for uscan
#version=3
#http://http://sourceforge.net/projects/dolibarr/files/Dolibarr%20installer%20for%20Debian-Ubuntu%20%28DoliDeb%29/ debian uupdate

View File

@@ -1,5 +0,0 @@
# watch control file for uscan
version=3
#http://sf.net/dolibarr/dolibarr-(.+)\.tgz
http://www.dolibarr.org/files/stable/package_debian-ubuntu/dolibarr_(.+)\.orig\.tar\.gz

View File

@@ -1,17 +1,17 @@
<?php
$force_install_message = 'KeepDefaultValuesMamp';
$force_install_main_data_root = '/Applications/MAMP/dolibarr_documents';
$force_install_type = 'mysqli';
$force_install_dbserver = 'localhost';
$force_install_port = '8889';
$force_install_database = 'dolibarr';
$force_install_createdatabase = '1';
$force_install_databaselogin = 'dolibarrmysql';
$force_install_databasepass = 'root';
$force_install_createuser = '1';
$force_install_databaserootlogin = 'root';
$force_install_databaserootpass = 'root';
$force_install_dolibarrlogin = 'admin';
$force_install_nophpinfo = '1';
$force_install_lockinstall = '444';
$force_install_message='KeepDefaultValuesMamp';
$force_install_main_data_root='/Applications/MAMP/dolibarr_documents';
$force_install_type='mysqli';
$force_install_dbserver='localhost';
$force_install_port='8889';
$force_install_database='dolibarr';
$force_install_createdatabase='1';
$force_install_databaselogin='dolibarrmysql';
$force_install_databasepass='root';
$force_install_createuser='1';
$force_install_databaserootlogin='root';
$force_install_databaserootpass='root';
$force_install_dolibarrlogin='admin';
$force_install_nophpinfo='1';
$force_install_lockinstall='444';
?>

View File

@@ -1,3 +0,0 @@
Dockerfile
README.md
docker-compose.yml

Some files were not shown because too many files have changed in this diff Show More