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

1235 Commits

Author SHA1 Message Date
Raphaël Doursenaud
b6eecb0394 Developer documentation fix 2013-11-07 22:14:43 +01:00
Raphaël Doursenaud
8e1fd7a083 PHP doesn't know reals, use float 2013-11-07 21:48:46 +01:00
Raphaël Doursenaud
e514b50d7e Typo fix 2013-11-07 21:48:45 +01:00
Raphaël Doursenaud
c845124b92 Object type is lowercase 2013-11-07 21:47:13 +01:00
Raphaël Doursenaud
01ea84a917 Static members are not always strings 
Update method documentation to reflect the mixed type expected
 2013-11-07 21:47:13 +01:00
Raphaël Doursenaud
d5ab0723ba Timestamp is not a type 
Timestamps are integers so let's document this correctly
 2013-11-07 21:47:13 +01:00
Laurent Destailleur
b2308ba65c Merge pull request #1284 from GPCsolutions/links 
Links
 2013-11-06 17:15:49 -08:00
Laurent Destailleur
4a29431b69 New: Add hidden option MAIN_SECURITY_HASH_ALGO to choose hash function 2013-11-06 16:32:25 +01:00
Cédric Salvador
039bd5b4c8 checkstyle 2013-11-06 10:20:11 +01:00
Cédric Salvador
b9c36e6e0a checkstyle 2013-11-06 10:20:11 +01:00
Cédric Salvador
b158e8bb74 translations 2013-11-06 10:19:17 +01:00
Cédric Salvador
b625b1843e add a field for label input 2013-11-06 10:19:17 +01:00
Cédric Salvador
28bfb10dbd UI 2013-11-06 10:19:16 +01:00
Cédric Salvador
3529f5238b display links 2013-11-06 10:17:18 +01:00
Cédric Salvador
e8e3752626 link creation in dol_add_file_process 2013-11-06 10:17:17 +01:00
Grand Philippe
a14de0c035 fix : language 2013-11-05 15:29:33 +01:00
Laurent Destailleur
b18e125143 Merge pull request #1279 from aspangaro/skype 
Task 157 : add a Skype button
 2013-11-05 05:33:33 -08:00
Laurent Destailleur
223e50276c Fix: Info tab was wrong with interventions 2013-11-05 14:24:37 +01:00
Laurent Destailleur
922929fffb Fix: Missing column 
Fix: Line was not added correctly
Fix: Missing message
 2013-11-05 11:17:54 +01:00
aspangaro
8fd021bf36 Merge branch 'upstream/develop' 2013-11-04 21:44:58 +01:00
aspangaro
d79ba9695a Task 157 : Add a skype button 2013-11-04 21:41:36 +01:00
Laurent Destailleur
32983b79ee Sec: Add option to salt password 2013-11-04 10:47:24 +01:00
Laurent Destailleur
e5fd19ffc0 Add option to salt hash passwords 2013-11-04 10:45:43 +01:00
Laurent Destailleur
692aa66cad Fix: Tons of bug with new field planned_workload 2013-10-30 21:44:04 +01:00
Laurent Destailleur
b3a0510407 Fix: Allow text input for hour. 2013-10-30 11:57:32 +01:00
Laurent Destailleur
5b3ba85669 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2013-10-29 18:07:12 +01:00
Laurent Destailleur
70342c09b8 Fix: Better management of using ajax for upload form (to solve problem 
when enabling ajax jquery multifile upload in some cases).
New: Add option to use a specific mask for uploaded filename
 2013-10-29 17:52:13 +01:00
Laurent Destailleur
c81bb60384 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/lib/pdf.lib.php
	htdocs/public/cron/cron_run_jobs.php
 2013-10-27 02:33:03 +02:00
Laurent Destailleur
483138d195 Comments 2013-10-23 13:38:18 +02:00
Grand Philippe
c773f21c2c fix wrong call name 2013-10-19 12:50:18 +02:00
Laurent Destailleur
df930d08b2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-10-18 14:03:35 +02:00
Laurent Destailleur
33b4c9fad7 Fix: Bug into xcal decode 2013-10-18 10:38:59 +02:00
Laurent Destailleur
bf3ca7a0f0 Fix: Avoid syntax error 2013-10-18 01:20:25 +02:00
Laurent Destailleur
bd06ee1abe Prototyping for other table outputs (div or datatable) 2013-10-17 18:37:08 +02:00
Laurent Destailleur
de97cd1812 Fix: json 2013-10-11 18:33:21 +02:00
Laurent Destailleur
303cad162b Qual: Show the rule name used to make calculation and link to change 
rule.
 2013-10-10 19:33:49 +02:00
Laurent Destailleur
019c86dff0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2013-09-28 13:26:52 +02:00
Laurent Destailleur
4cf84c4ea8 New: Add hidden option MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS 2013-09-28 13:24:58 +02:00
Laurent Destailleur
470ccba80a Qual: Fix two awful code with hardcoded values. This remove also 2 TODO. 2013-09-26 15:41:04 +02:00
Laurent Destailleur
065c87d81c Qual: uniformize code: property ->tel on objects is now ->phone 
everywhere
 2013-09-25 19:58:22 +02:00
Laurent Destailleur
072247f1c8 Fix: Use correct translation key 2013-09-25 19:07:25 +02:00
Christophe Battarel
f13b9cec29 escape dialog title 2013-09-24 15:59:30 +02:00
Christophe Battarel
aa820d56ba Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 
is reverts commit 8a4041e534.

Conflicts:

	htdocs/core/lib/company.lib.php
	htdocs/install/mysql/migration/3.4.0-3.5.0.sql
	htdocs/societe/class/societe.class.php

Conflicts:
	ChangeLog
	htdocs/core/lib/company.lib.php
 2013-09-24 15:52:19 +02:00
Laurent Destailleur
99de8b22a3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-23 19:59:52 +02:00
Laurent Destailleur
890c96355d Check parameter to make bug detection seasier 2013-09-23 19:53:21 +02:00
Laurent Destailleur
7ed5d5e543 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-09-23 11:25:06 +02:00
Laurent Destailleur
dd0612099c Qual: Uniformize fields departement_id into state_id 2013-09-20 14:35:58 +02:00
Cédric Salvador
81a9bc3960 checkstyle 2013-09-20 10:56:15 +02:00
Cédric Salvador
9fdac2aa8e changed dol_htmlentities() parameters to match standard htmlentities() 2013-09-20 10:36:43 +02:00
Laurent Destailleur
986794ad7f Fix doxygen 2013-09-18 23:39:53 +02:00
Laurent Destailleur
491bd76c1b Work on openif authentication mode 2013-09-18 21:22:24 +02:00
Laurent Destailleur
8526d34d3b Fix: Calculation of second rounding method is available for supplier 
invoices.
 2013-09-18 16:46:54 +02:00
Laurent Destailleur
1e29a97a89 Fix: checkstyle 2013-09-17 21:12:34 +02:00
simnandez
f7299f1a28 [ task #1063 ] Allow edit localtaxes rate for thirds 2013-09-17 18:06:06 +02:00
simnandez
7f21e596dd [ task #1063 ] Allow edit localtaxes rate for thirds. Init Works 2013-09-17 17:17:59 +02:00
Cédric Salvador
fc136d0d06 changed parameter 2013-09-16 14:17:53 +02:00
Cédric Salvador
d9a26d0aa9 natural search in list pages 2013-09-16 14:17:53 +02:00
Christophe Battarel
33fbee51bd ability to copy contact address to clipboard 2013-09-15 19:09:22 +02:00
Christophe Battarel
a100faa4b1 ability to copy contact address to clipboard 2013-09-15 18:33:20 +02:00
Laurent Destailleur
4b2ee84ede Merge pull request #1230 from GPCsolutions/deprecated-5.5 
Deprecated in PHP 5.5
 2013-09-11 06:09:26 -07:00
Raphaël Doursenaud
9636e1aafc Replaced PHP 5.5 deprecated calls 2013-09-11 14:48:02 +02:00
Laurent Destailleur
0bb18cb05c New: Can use tag {mm} before {yy} even when there is a reset into 
numbering masks.
Qual: Enhance phpunit tests to include this case.
 2013-09-11 14:18:56 +02:00
Laurent Destailleur
21d9aa2fe4 Fix: [ bug #1054 ] Customer Invoice Numbering failure 2013-09-11 11:01:02 +02:00
Laurent Destailleur
eb10093ae8 Fix: Regression detected by phpunit 2013-09-11 10:05:01 +02:00
simnandez
bc0356db1f [ task #1060 ] Register fields localtax(1|2)_type into details tables 2013-09-10 18:32:03 +02:00
simnandez
634f70a74d New: [ task #1060 ] Register fields localtax(1|2)_type into details 
tables. Invoices
 2013-09-10 17:07:38 +02:00
Laurent Destailleur
598f6883a2 Doc comments 2013-09-10 11:39:20 +02:00
Laurent Destailleur
74a50d8d6c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-07 19:51:00 +02:00
Laurent Destailleur
bd24711b30 Fix: navigation of supplier invoices 2013-09-07 19:50:47 +02:00
Laurent Destailleur
87a4418baf Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-09-06 10:50:44 +02:00
Laurent Destailleur
9fa6d4ccdf Fix: Avoid error for free products. Also add hidden otion to enable 
this. In most cases, we don't want to do this.
 2013-09-06 10:40:44 +02:00
Laurent Destailleur
38e4b0f9ac Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/debian/watch
 2013-09-05 23:57:30 +02:00
Raphaël Doursenaud
6e64e0e7be Fixed gd calls for windows bitmap images 2013-09-05 17:56:28 +02:00
Laurent Destailleur
e40d644085 Fix: Remove warning 2013-09-04 16:49:20 +02:00
Grand Philippe
6d6f30725b Add an additional description for the category products 2013-09-03 11:41:33 +02:00
Grand Philippe
dfdc9da781 Add an additional description for the category products 2013-09-03 11:15:19 +02:00
simnandez
a321264a2a Fix: Localtaxes balance not showing 
Conflicts:
	ChangeLog
 2013-08-29 10:03:32 +02:00
simnandez
fa4a9c73c4 Fix: Localtaxes balance not showing 2013-08-29 09:58:07 +02:00
Laurent Destailleur
903b75c1cd Merge pull request #1165 from PaulPoulain/975-develop 
T975-develop: Don't print the mail of the contact who is gone
 2013-08-25 03:23:26 -07:00
Laurent Destailleur
07cba2d232 Merge pull request #1194 from grandoc/develop 
fix : warning during install
 2013-08-24 13:43:36 -07:00
Laurent Destailleur
8c90ad8afa Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/modFacture.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
	htdocs/expedition/fiche.php
	htdocs/fourn/fiche.php
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/el_GR/agenda.lang
	htdocs/langs/el_GR/banks.lang
	htdocs/langs/el_GR/bills.lang
	htdocs/langs/el_GR/bookmarks.lang
	htdocs/langs/el_GR/boxes.lang
	htdocs/langs/el_GR/cashdesk.lang
	htdocs/langs/el_GR/categories.lang
	htdocs/langs/el_GR/commercial.lang
	htdocs/langs/el_GR/companies.lang
	htdocs/langs/el_GR/compta.lang
	htdocs/langs/el_GR/contracts.lang
	htdocs/langs/el_GR/cron.lang
	htdocs/langs/el_GR/deliveries.lang
	htdocs/langs/el_GR/dict.lang
	htdocs/langs/el_GR/donations.lang
	htdocs/langs/el_GR/ecm.lang
	htdocs/langs/el_GR/errors.lang
	htdocs/langs/el_GR/exports.lang
	htdocs/langs/el_GR/externalsite.lang
	htdocs/langs/el_GR/ftp.lang
	htdocs/langs/el_GR/help.lang
	htdocs/langs/el_GR/holiday.lang
	htdocs/langs/el_GR/install.lang
	htdocs/langs/el_GR/interventions.lang
	htdocs/langs/el_GR/languages.lang
	htdocs/langs/el_GR/ldap.lang
	htdocs/langs/el_GR/mailmanspip.lang
	htdocs/langs/el_GR/mails.lang
	htdocs/langs/el_GR/main.lang
	htdocs/langs/el_GR/margins.lang
	htdocs/langs/el_GR/members.lang
	htdocs/langs/el_GR/opensurvey.lang
	htdocs/langs/el_GR/orders.lang
	htdocs/langs/el_GR/oscommerce.lang
	htdocs/langs/el_GR/other.lang
	htdocs/langs/el_GR/paybox.lang
	htdocs/langs/el_GR/paypal.lang
	htdocs/langs/el_GR/products.lang
	htdocs/langs/el_GR/projects.lang
	htdocs/langs/el_GR/propal.lang
	htdocs/langs/el_GR/sendings.lang
	htdocs/langs/el_GR/shop.lang
	htdocs/langs/el_GR/sms.lang
	htdocs/langs/el_GR/stocks.lang
	htdocs/langs/el_GR/suppliers.lang
	htdocs/langs/el_GR/trips.lang
	htdocs/langs/el_GR/users.lang
	htdocs/langs/el_GR/withdrawals.lang
	htdocs/langs/el_GR/workflow.lang
	htdocs/margin/productMargins.php
 2013-08-24 22:41:32 +02:00
Laurent Destailleur
1c527b8db9 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-08-24 20:59:02 +02:00
Grand Philippe
e56e0ebfb5 add extrafields 2013-08-24 13:49:55 +02:00
Laurent Destailleur
9da5f7f47a Qual: Doxygen 2013-08-22 16:49:23 +02:00
lalaina rasamoelina
8a4041e534 T975-develop Add an element (statut) in the table llx_socpeople 
It's used to mark if the contact is gone or no(we can activate or desactivate the contact with this)
And if the contact is gone,we don't print her mail in the mail list,where we can send a mail
 2013-08-22 11:04:06 +02:00
lalaina rasamoelina
1295c8d27b Put the status of contact in the list of contact 2013-08-22 11:04:06 +02:00
lalaina rasamoelina
dc3ccf6373 Style of page 2013-08-22 11:04:06 +02:00
lalaina rasamoelina
5ed186e178 Delete the contact who are gone,in the email list 2013-08-22 11:04:06 +02:00
Grand Philippe
49e38e1263 fix some trad 2013-08-16 10:16:06 +02:00
Florian Henry
3cf3dbeb51 Add pdf link into supplier invoice list and supplier order list 2013-08-09 13:48:44 +02:00
Laurent Destailleur
b1f528f4d5 Comment code of a deprecated variable. 2013-08-07 20:56:10 +02:00
Laurent Destailleur
0f86755033 Fix: Found a dozen of bugs into sub module delivery of module shipment. 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/fiche.php
 2013-08-07 15:29:13 +02:00
Laurent Destailleur
d5a57f3717 Fix: Found a dozen of bugs into sub module delivery of module shipment. 2013-08-07 15:08:30 +02:00
Laurent Destailleur
afae841ae4 Fix: Permissions on files 2013-08-06 00:36:21 +02:00
Laurent Destailleur
c41a955cbe Fix: Permissions on files 2013-08-06 00:36:04 +02:00
Cédric Salvador
0127ed8b33 added hook to the print address function 2013-08-05 18:07:10 +02:00
Laurent Destailleur
447d0063af Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/langs/ca_ES/withdrawals.lang
	htdocs/langs/es_ES/withdrawals.lang
	htdocs/langs/fr_FR/withdrawals.lang
	htdocs/langs/ja_JP/compta.lang
	htdocs/langs/ja_JP/contracts.lang
	htdocs/langs/sl_SI/withdrawals.lang
	htdocs/langs/zh_CN/admin.lang
	htdocs/langs/zh_CN/agenda.lang
	htdocs/langs/zh_CN/bills.lang
	htdocs/langs/zh_CN/boxes.lang
	htdocs/langs/zh_CN/commercial.lang
	htdocs/langs/zh_CN/companies.lang
	htdocs/langs/zh_CN/compta.lang
	htdocs/langs/zh_CN/contracts.lang
	htdocs/langs/zh_CN/errors.lang
	htdocs/langs/zh_CN/exports.lang
	htdocs/langs/zh_CN/install.lang
	htdocs/langs/zh_CN/interventions.lang
	htdocs/langs/zh_CN/mails.lang
	htdocs/langs/zh_CN/main.lang
	htdocs/langs/zh_CN/members.lang
	htdocs/langs/zh_CN/orders.lang
	htdocs/langs/zh_CN/other.lang
	htdocs/langs/zh_CN/products.lang
	htdocs/langs/zh_CN/propal.lang
	htdocs/langs/zh_CN/stocks.lang
	htdocs/langs/zh_CN/suppliers.lang
	htdocs/langs/zh_CN/users.lang
	htdocs/langs/zh_TW/admin.lang
	htdocs/langs/zh_TW/agenda.lang
	htdocs/langs/zh_TW/banks.lang
	htdocs/langs/zh_TW/boxes.lang
	htdocs/langs/zh_TW/companies.lang
	htdocs/langs/zh_TW/compta.lang
	htdocs/langs/zh_TW/contracts.lang
	htdocs/langs/zh_TW/errors.lang
	htdocs/langs/zh_TW/exports.lang
	htdocs/langs/zh_TW/install.lang
	htdocs/langs/zh_TW/interventions.lang
	htdocs/langs/zh_TW/mails.lang
	htdocs/langs/zh_TW/members.lang
	htdocs/langs/zh_TW/orders.lang
	htdocs/langs/zh_TW/propal.lang
	htdocs/langs/zh_TW/suppliers.lang
 2013-08-03 16:24:52 +02:00
Laurent Destailleur
3730d874c9 Fix: [ bug #991 ] Error when adding a product in POS when no Tax is 
associated to the country of the company
 2013-08-01 18:09:01 +02:00
Laurent Destailleur
8b0169f468 Fix: [ bug #991 ] Error when adding a product in POS when no Tax is 
associated to the country of the company
 2013-08-01 18:01:25 +02:00
Florian Henry
325ceda4dc [ task #1014 ] Add option to recursivly add parent cactegory 2013-07-31 21:52:49 +02:00
Laurent Destailleur
87713c49ac New: Into POST forms, if you can add a parameter DOL_AUTOSET_COOKIE with 
a vlue that is list name, separated by a coma, of other POST parameters,
Dolibarr will automatically save this parameters into user cookies.
New: Can select to see number or amount or both, for graph boxes.
 2013-07-29 19:12:04 +02:00
Laurent Destailleur
61f11d3621 Fix: Duplicate tooltip 2013-07-26 11:12:29 +02:00
Laurent Destailleur
fe079f71da Merge remote-tracking branch 'origin/3.3' into 3.4 2013-07-25 21:53:38 +02:00
Laurent Destailleur
16d530b22d Fix: Watermark make pagebreak crazy. 2013-07-25 18:58:47 +02:00
Laurent Destailleur
58da76292f Fix: Watermark make pagebreak crazy. 2013-07-25 18:56:09 +02:00
Laurent Destailleur
cc83ad0b0e Merge remote-tracking branch 'origin/3.4' into develop 2013-07-24 14:15:35 +02:00
Laurent Destailleur
2f2f2b66c4 Fix: creation of thumbs not working 2013-07-24 11:26:09 +02:00
Laurent Destailleur
30cd4aeced Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-07-23 18:37:09 +02:00
Laurent Destailleur
cbeeb463e2 Fix: Missing tr line 2013-07-23 15:26:35 +02:00
Maxime Kohlhaas
da3e711be7 Task 149 : fix dir on company + added # of notes and documents on supplier order, invoice and project 2013-07-20 10:54:38 +02:00
Maxime Kohlhaas
28eb9d07b2 Task 149 : add # of notes and doc in tab + have always last 3 tabs be notes, doc and info 2013-07-20 09:07:10 +02:00
Laurent Destailleur
e06752bc0e Merge pull request #1105 from atm-maxime/mko149 
Task 149 : # of files and notes appears in tab
 2013-07-19 04:14:05 -07:00
Laurent Destailleur
c943ef8edb Fix: doxygen 2013-07-18 23:39:29 +02:00
Laurent Destailleur
a240dba290 Fix: Translation of text 2013-07-18 19:01:19 +02:00
Maxime Kohlhaas
e0d037dae5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko149 2013-07-18 11:06:38 +02:00
Florian Henry
0c0a64f532 [ task #924 ] Add numbering rule on task 
[ task #925 ] Add ODT document generation for Tasks in project module
 2013-07-18 10:24:45 +02:00
Laurent Destailleur
7b97214df5 Merge pull request #1096 from FHenry/develop_categorycontact 
Develop categorycontact
 2013-07-17 08:41:02 -07:00
Florian Henry
e07eac9b17 [ task #519 ] Add category association with contacts 2013-07-16 21:04:58 +02:00
Maxime Kohlhaas
a6a058ddae Fix by including lib files 2013-07-16 18:45:40 +02:00
Maxime Kohlhaas
c0feda4921 Task 149 : added on product 2013-07-16 01:28:24 +02:00
Maxime Kohlhaas
aa8e43cd1b Task 149 : Add number of notes and attached files into tab. Started with thirdparty 2013-07-16 01:09:19 +02:00
Laurent Destailleur
2ae1e787c9 Fix: Bad date ranges 
Conflicts:
	scripts/invoices/rebuild_merge_pdf.php
 2013-07-15 21:49:54 +02:00
Laurent Destailleur
e2b63bb8dd Fix: Bad date ranges 2013-07-15 21:47:45 +02:00
Laurent Destailleur
28c28bd217 New: Add option excludethirdparties and onlythirdparties into merge pdf 
scripts.
 2013-07-15 20:56:43 +02:00
Laurent Destailleur
dd10ff8a11 eol 2013-07-15 18:51:56 +02:00
Laurent Destailleur
17f3d98fb3 New: Add option to exclude some thirdparties 2013-07-15 18:44:59 +02:00
Laurent Destailleur
d637212dce Fix: alternative url were sometimes relative to server, sometimes to 
DOL_URL_ROOT. Fix to be always relative to DOL_URL_ROOT.
 2013-07-15 00:58:40 +02:00
Laurent Destailleur
6a1446f4dd Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE 2013-07-14 16:35:02 +02:00
Laurent Destailleur
154cd1fcf9 Fix: Sort on ref for supplier invoice into ged 2013-07-14 01:10:18 +02:00
Laurent Destailleur
1e6171ad0e Fix: Sort on ref for supplier invoice into ged 2013-07-14 00:40:22 +02:00
Laurent Destailleur
3a9ffb19c3 fix: eol 2013-07-13 21:14:05 +02:00
Laurent Destailleur
ad8904a4fb Can add a picto onto line of files list. 2013-07-12 15:10:32 +02:00
Cédric Salvador
03ad72a1fa fix dol_buildpath failing when processing path such as file.php?id=__ID__ 2013-07-09 18:14:50 +02:00
Laurent Destailleur
5706779c8b New: Add a page on performance advice 2013-07-09 13:50:20 +02:00
Laurent Destailleur
b26250c45a Fix when alt path is full url instead of relative. 2013-07-07 23:37:56 +02:00
Laurent Destailleur
7c163f7be3 Fix: Running fixdosfile onto all project 2013-07-07 13:17:48 +02:00
Laurent Destailleur
2bc650bf61 Qual: Remove tons of codesniffer errors and warnings. 2013-07-07 13:14:32 +02:00
Laurent Destailleur
7b5e0678db New: Make some changes to allow usage of alternative 
$dolibarr_main_url_root variables.
Can now use several alternative path. Fix several bugs with all code.
 2013-07-07 03:26:51 +02:00
Laurent Destailleur
5385d87995 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/ca_ES/errors.lang
	htdocs/langs/ca_ES/main.lang
	htdocs/langs/ca_ES/opensurvey.lang
	htdocs/langs/ca_ES/paybox.lang
	htdocs/langs/ca_ES/products.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/langs/es_ES/main.lang
	htdocs/langs/es_ES/products.lang
 2013-07-05 21:56:54 +02:00
Regis Houssin
7e70d935b6 Fix: change for use url of image 2013-07-03 16:07:31 +02:00
Regis Houssin
a9198e66eb Fix: change for use url of image 2013-07-03 16:06:42 +02:00
Laurent Destailleur
6f5a918373 New: Add option MAIN_MOTD_SETUPPAGE to add a content onto setup page. 
Also content for MAIN_MOTD_SETUPPAGE, MAIN_MOTD_SETUPPAGE, MAIN_HOME
now accept "|langfile" into translation key to use a specific language
file.
 2013-07-02 21:53:34 +02:00
Laurent Destailleur
1beb50e870 Fix: State for turkey 2013-07-02 09:58:09 +02:00
Laurent Destailleur
134187ef94 Fix: Overlapping of company name. 
Fix: Missing state for ome countries.
 2013-07-01 00:08:44 +02:00
Laurent Destailleur
10e28fa27a Fix: Overlapping of company name. 
Fix: Missing state for ome countries.
 2013-07-01 00:05:39 +02:00
Laurent Destailleur
387c213aea New: Add box for graph of customer orders 2013-06-30 23:01:28 +02:00
Laurent Destailleur
7e74d9890b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-06-27 17:47:03 +02:00
Laurent Destailleur
c92aa1f6aa New: dol_strintotime accept format YYYY-MM-DD HH:MM:SS 
Fix: create member was missing field import_key
New: Uniformize code
 2013-06-27 17:45:58 +02:00
Laurent Destailleur
9b235f6879 Fix: Remove space at end of binary files 2013-06-26 02:05:18 +02:00
Laurent Destailleur
af4651f1a2 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/perl/virtualmin/dolibarr.pl
	htdocs/core/lib/files.lib.php
	htdocs/langs/en_US/projects.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/webservices/server_other.php
 2013-06-25 23:22:00 +02:00