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

2220 Commits

Author SHA1 Message Date
Laurent Destailleur
86c5dc20e3 NEW Can choose the root category to show for TakePOS module 2019-03-15 02:12:40 +01:00
Laurent Destailleur
39e6e71b0d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
 2019-03-14 14:20:34 +01:00
Regis Houssin
47057b431d FIX translation 2019-03-12 07:56:22 +01:00
Laurent Destailleur
b710e28ffa Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/admin/adherent.php
	htdocs/admin/barcode.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/langs/en_US/admin.lang
 2019-03-09 01:20:13 +01:00
Laurent Destailleur
1a96a7a88f FIX More complete auto setup of barcode module 
Add tooltip help on member setup module
 2019-03-08 11:31:12 +01:00
Laurent Destailleur
3a2a1b4a56 Debug module ticket 2019-02-26 13:43:09 +01:00
florian HENRY
5b5f96bafb NEW : measuring unit dictionnary and product size/unit import 2019-02-12 16:58:11 +01:00
Frédéric FRANCE
ba32c3b782
first parameter of print_liste_field_titre was translated 2019-02-10 16:06:07 +01:00
Laurent Destailleur
c77d328f12 Fix translation 2019-02-09 19:05:15 +01:00
florian HENRY
3f20cae6d3 NEW: setup default thridparty type (customer or prospect/customer) 2019-02-06 10:54:11 +01:00
Laurent Destailleur
4c31749f4b Add tooltip on setup 2019-01-31 11:11:56 +01:00
Laurent Destailleur
ccbec3d29f Fix typo 2019-01-22 16:27:23 +01:00
Laurent Destailleur
51bdf5f949 Fix trans 2019-01-22 16:06:20 +01:00
Laurent Destailleur
300889f53a # WARNING: head commit changed in the meantime 
Fix
 2019-01-19 13:22:38 +01:00
Laurent Destailleur
971670da8d Clean language file 2019-01-18 14:24:49 +01:00
Laurent Destailleur
c357cb8c4e Clean code 2019-01-16 12:42:54 +01:00
Laurent Destailleur
48e7fcd821 Remove not used keys 2019-01-13 16:55:46 +01:00
Laurent Destailleur
ab3365440c Fix translation 2019-01-13 16:51:34 +01:00
Laurent Destailleur
653acf556b Fix translation Customer order into Sales order 2019-01-10 12:15:42 +01:00
Laurent Destailleur
1403ac3cc1 Trans 2019-01-07 18:07:56 +01:00
ldestailleur
451b3e30cc Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/langs/en_US/cashdesk.lang
 2019-01-04 19:36:20 +01:00
ldestailleur
cf84fdf7c7 Translate option "Simplify interface for blind persons" 2019-01-03 20:07:58 +01:00
ldestailleur
dbbfdd984a Fix emailcollector can't be used without syntax rules 2019-01-03 11:47:27 +01:00
Laurent Destailleur
a997001dbf Fix typo 2018-12-22 18:34:48 +01:00
torvista
2ff35895b6 minor improvements 
new constants for missing direct debit terms
 2018-12-20 23:36:35 +01:00
torvista
9f9a468f6a more fine tuning 2018-12-19 16:22:27 +01:00
Laurent Destailleur
44a6644969 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-18 21:55:53 +01:00
Laurent Destailleur
48162db33d FIX Rename of image file lose the thumbs 2018-12-17 20:19:11 +01:00
Laurent Destailleur
9ce07b9582 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2018-12-16 15:36:18 +01:00
Laurent Destailleur
988ba172ae Clean code of POS modules 2018-12-16 14:59:51 +01:00
Laurent Destailleur
54ffba793f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/install/mysql/migration/8.0.0-9.0.0.sql
	htdocs/langs/en_US/admin.lang
 2018-12-15 18:21:37 +01:00
Laurent Destailleur
944f9ac894 Typo 2018-12-15 18:14:08 +01:00
Laurent Destailleur
527ad04ae8 FIX Mandatory field feature should works on textarea 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2018-12-15 18:13:30 +01:00
Laurent Destailleur
6188156c52 FIX Mandatory field feature should works on textarea 2018-12-15 18:11:40 +01:00
Laurent Destailleur
699dc239d4 Fix US trans 2018-12-15 12:24:14 +01:00
torvista
6f5f4bd3de added latest Develop edits 2018-12-14 20:33:07 +01:00
torvista
805c184163 more supplier->vendor found! 
use of e-mail, EMail, Email rationalised
grammar changes for module titles and descriptions
added constants for Stripe to admin to override class constants
 2018-12-14 20:17:22 +01:00
Laurent Destailleur
55487da03e
Merge branch 'develop' into langs_en_US 2018-12-14 11:09:25 +01:00
torvista
351274d85d 1) Standardization of use of "third party" 
as a noun : third party
as an modifier: third-party contact
2) use of colons: no space before
3) Use of supplier/vendor was mixed.
Vendor is B2B or B2C, supplier is B2B. Changed all references to supplier.
4) Many minor grammar changes.
 2018-12-11 10:08:19 +01:00
Laurent Destailleur
b35a9c0e64 FIX Edition of menu fails (mainmenu required for top menu) 2018-12-10 17:50:58 +01:00
Laurent Destailleur
94c2d7194c Trans Website 2018-11-30 12:41:35 +01:00
Laurent Destailleur
3c0ff40e43 Fix trans 2018-11-29 00:41:12 +01:00
Laurent Destailleur
0b6aaccfcc sync transifex 2018-11-27 16:35:47 +01:00
Laurent Destailleur
ea7c77d788 Trans 2018-11-23 11:09:27 +01:00
Laurent Destailleur
97af22369d Trans 2018-11-22 13:47:55 +01:00
Laurent Destailleur
6514b51382 Better help 2018-11-20 21:59:05 +01:00
Laurent Destailleur
4b82538941 Better module position 2018-11-20 14:56:14 +01:00
Laurent Destailleur
7f33403d43 Fix translation 2018-11-17 22:55:13 +01:00
Laurent Destailleur
6b8a3094f0 Fix missing some keys in substitution arrays 2018-11-17 00:14:23 +01:00
Laurent Destailleur
5d596fe584 Fix trackid must contains an id of instance 2018-11-16 16:43:13 +01:00
Laurent Destailleur
f32706259a Sync transifex 2018-11-16 14:13:00 +01:00
Laurent Destailleur
85cdc44105 Several fixes in project creation, cache of dolGetIfFromCode, ... 2018-11-15 13:39:12 +01:00
Laurent Destailleur
0b57faa7b4 Fix help 2018-11-11 14:42:11 +01:00
Laurent Destailleur
bd78ea1ccf
Merge pull request #9987 from frederic34/dkim 
add admin dkim translation
 2018-11-10 12:16:43 +01:00
Laurent Destailleur
e86e3ec7ac Work on email collector 2018-11-09 19:30:44 +01:00
Laurent Destailleur
f1287578f3 Work on emailcollector 2018-11-09 18:18:17 +01:00
Frédéric FRANCE
6cd27d8c80
add admin dkim translation 2018-11-09 18:08:06 +01:00
Laurent Destailleur
193b153fbf Work on email collector 2018-11-07 18:02:08 +01:00
Laurent Destailleur
6ba78b2bb3 Work on email collector 2018-11-07 16:33:06 +01:00
Laurent Destailleur
c4db549f94 Work on emailcollector 2018-11-06 19:49:52 +01:00
Laurent Destailleur
4a25317f10 Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e FIX sanitize param $action 2018-11-05 17:53:31 +01:00
Laurent Destailleur
dd70f1bf08 Debug emailcollector 2018-11-05 16:59:40 +01:00
Laurent Destailleur
68ec172798 Fix setup to enable reminder b email 2018-11-03 12:37:52 +01:00
Laurent Destailleur
1ba716b82c Fix do not allow use of second or third tax without using 1st one. 2018-10-25 14:39:54 +02:00
Laurent Destailleur
6d1a934e8d
Merge pull request #9792 from atm-greg/Disable_customerprospect_thirdparty_type 
NEW Add configuration to disable "customer/prospect" thirdparty type
 2018-10-19 13:47:33 +02:00
Laurent Destailleur
c1d2556965
Update admin.lang 2018-10-19 13:47:18 +02:00
Laurent Destailleur
548fafc6e9 Fix trans 2018-10-18 01:32:06 +02:00
Laurent Destailleur
b2a7845c8a Fix trans 2018-10-18 01:28:14 +02:00
Laurent Destailleur
63f4704725 Fix translation 2018-10-18 01:05:10 +02:00
atm-greg
d86c44e641 Add conf to disable a thirdparty type 2018-10-17 15:55:46 +02:00
Laurent Destailleur
0a8f305151 Trans 2018-10-15 02:40:49 +02:00
Laurent Destailleur
abf8867061
Merge pull request #8207 from atm-john/New_invoice_default_documents 
NEW hidden option to define an invoice template for each invoice type
 2018-10-14 16:36:37 +02:00
Laurent Destailleur
26c9158ed7 Label of DPO 2018-10-14 14:20:28 +02:00
Laurent Destailleur
8a928a72fa Sync transifex 2018-10-13 14:03:32 +02:00
Laurent Destailleur
ded5c4c3dd Social network module 2018-10-12 11:02:03 +02:00
Laurent Destailleur
3c8b365c3e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-09 14:53:39 +02:00
Laurent Destailleur
923b561aff FIX Option for prof id mandatory not working with custom type of company 2018-10-08 20:01:45 +02:00
Laurent Destailleur
111d589474 NEW Can mix offset before and after with rules for due date of invoices 2018-10-04 16:06:26 +02:00
Laurent Destailleur
771922f427 Use 2 distinct left menu entries for leads and projects 2018-10-01 18:56:47 +02:00
Laurent Destailleur
aaa5efc77e Clean Take pos module 2018-09-28 22:06:04 +02:00
Laurent Destailleur
f990719daa Add experimental module TakePOS 2018-09-28 13:31:41 +02:00
Laurent Destailleur
851fd4cc18 NEW Can set the default focus of each page. 
NEW Can set if a field is mandatory on form level.
 2018-09-28 00:52:15 +02:00
Laurent Destailleur
a623d80830 Work on mandatory form fields 2018-09-27 16:38:18 +02:00
Laurent Destailleur
ad6895aa2e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-24 10:23:09 +02:00
Laurent Destailleur
57e359cd40 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/agenda.lang
 2018-09-24 10:18:13 +02:00
Laurent Destailleur
dbb75e35a1 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/agenda.lang
 2018-09-24 10:14:38 +02:00
Laurent Destailleur
12690666e2 Missing trans 2018-09-24 10:03:08 +02:00
Laurent Destailleur
48ca7e4603 Typo 2018-09-23 15:47:13 +02:00
Laurent Destailleur
8aa22f2c33 NEW Add option to swap sender/recipient address on PDF 2018-09-23 14:57:44 +02:00
Laurent Destailleur
a078951a94 Add an help for user to avoid bad configuration 2018-09-21 11:12:08 +02:00
Laurent Destailleur
d35687c8b3 Work on module social network 2018-09-19 01:45:56 +02:00
Laurent Destailleur
e07ce644e8 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/admin.lib.php
	htdocs/langs/en_US/admin.lang
 2018-09-18 11:49:35 +02:00
Laurent Destailleur
1e36aba35f Trans 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2018-09-17 16:42:44 +02:00
Laurent Destailleur
d717e28338 Trans 2018-09-17 14:15:30 +02:00
Laurent Destailleur
f3ce7cb5a5 Quick hack to provide help to fix pb of undesirable files 2018-09-17 10:40:42 +02:00
Laurent Destailleur
f88dba91ab Trans 2018-09-15 14:15:21 +02:00
Laurent Destailleur
765d8ec1fe Better description 2018-09-12 21:33:48 +02:00
Laurent Destailleur
f46a137e25 Better description 2018-09-12 21:32:58 +02:00
Laurent Destailleur
c5e30b61c0 Fix translation 2018-09-12 21:25:14 +02:00
Laurent Destailleur
9d9e2bc3e3
Merge pull request #9405 from fmarcet/develop 
NEW: Highlight lines on lists when they are checked
 2018-09-12 20:50:42 +02:00
Laurent Destailleur
fcabe67e4b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-12 13:30:28 +02:00
Laurent Destailleur
0ef17fe581 FIX Problems with permissions of module to record payment of salaries 2018-09-07 13:32:56 +02:00
Laurent Destailleur
c5695db3e4 NEW Can disable meteo on smartphone only 2018-09-06 11:09:51 +02:00
Ferran Marcet
b658626e21 NEW: Highlight lines on lists when they are checked 2018-09-04 11:54:13 +02:00
Laurent Destailleur
1b542d5be3 Fix translation 2018-08-28 18:36:46 +02:00
Laurent Destailleur
9a82cc3261 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-18 02:55:49 +02:00
Laurent Destailleur
dedfd6d493 Fix missing translation 2018-08-18 02:55:22 +02:00
florian HENRY
45a52a955e NEW: Add optoin to display thirdparty adress in combolist 2018-08-06 10:52:10 +02:00
Laurent Destailleur
dc2fec8f57 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-24 19:37:04 +02:00
Laurent Destailleur
df7a3598a8 Trans 2018-07-23 10:56:28 +02:00
Steve
2cf28e055b more minor grammar corrections 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/langs/en_US/companies.lang
	htdocs/langs/en_US/exports.lang
	htdocs/langs/en_US/mails.lang
	htdocs/langs/en_US/products.lang
	htdocs/langs/en_US/sms.lang
 2018-07-16 09:43:19 +02:00
Laurent Destailleur
ae76e61885
Merge pull request #9108 from torvista/misc-texts 
more minor grammar corrections
 2018-07-16 09:23:10 +02:00
Steve
bd9149e03b more minor grammar corrections 2018-07-16 07:28:22 +02:00
Laurent Destailleur
64517d4c0b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/langs/en_US/admin.lang
 2018-07-10 14:06:51 +02:00
Laurent Destailleur
5f52dfa873 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-10 14:02:40 +02:00
Laurent Destailleur
c01975a40b
Merge pull request #9084 from torvista/texts-setup-en_US 
Texts corrections /langs/en_US
 2018-07-10 10:41:28 +02:00
Steve
e45e74a3bd spelling and some grammar corrections to en_US 2018-07-09 17:38:28 +02:00
Laurent Destailleur
e0c3d176ed
Merge pull request #9067 from torvista/install-texts-en_US 
spelling and some grammar corrections for installation texts en_US
 2018-07-09 17:11:58 +02:00
Laurent Destailleur
291f149a9b NEW Can set a tooltip help text on extrafields 2018-07-08 20:26:48 +02:00
Laurent Destailleur
41f21f3867 Translation 2018-07-08 20:06:24 +02:00
Laurent Destailleur
8ec9257302 Fix translation 2018-07-08 20:03:14 +02:00
Steve
5944c161bc spelling and some grammar corrections for installation texts en_US 2018-07-07 08:41:17 +02:00
Laurent Destailleur
01e8f78c30 Trans 2018-07-03 09:58:36 +02:00
Laurent Destailleur
055d818069 FIX dashboard with IE10 not supporting flex 2018-06-28 12:09:13 +02:00
Laurent Destailleur
5908fc1471 Trans 2018-06-16 13:15:24 +02:00
Laurent Destailleur
f79466d483 Trans 2018-06-14 11:41:14 +02:00
Laurent Destailleur
910652eb6d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/admin.lang
 2018-06-13 23:07:30 +02:00
Laurent Destailleur
94919d6e99 Translation 2018-06-11 15:17:05 +02:00
Laurent Destailleur
31eeaf9914 Trans 2018-06-09 13:46:42 +02:00
Laurent Destailleur
ac721b46bc Trans 2018-06-06 11:16:42 +02:00
Laurent Destailleur
f28a6e59c8 Look and feel v8 2018-06-05 16:30:16 +02:00
Laurent Destailleur
da44ea858c Trans 2018-06-04 13:35:30 +02:00
Laurent Destailleur
488c0c030e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modProduct.class.php
 2018-05-23 18:09:25 +02:00
Laurent Destailleur
4967c678b8 Fix translation 2018-05-23 18:05:19 +02:00
John
05bb98f4c0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents 2018-05-16 11:49:37 +02:00
Laurent Destailleur
d52305cef8 NEW Add entry for the GDPR contact 2018-05-15 11:50:42 +02:00
Laurent Destailleur
b21059ac25 Translation 2018-05-01 00:50:47 +02:00
Laurent Destailleur
19c12f3103 Translation 2018-04-30 09:31:09 +02:00
Laurent Destailleur
55f982e504 Removed deprecated FPDI option and reorganise PDF setup page 2018-04-30 09:28:24 +02:00
Laurent Destailleur
e168240ab0 Debug module DAV 2018-04-29 18:32:15 +02:00
Laurent Destailleur
94d6e178f7 Work on vat report code rewrite 2018-04-28 16:06:46 +02:00
Laurent Destailleur
07b9a9b44d Better US english 2018-04-28 13:08:09 +02:00
Laurent Destailleur
59d0e9a64f trans 2018-04-25 12:36:16 +02:00
Laurent Destailleur
ae412f228d NEW Experimental DAV module provides a public and private directory 2018-04-25 12:22:02 +02:00
Laurent Destailleur
f6743484dd Better support of option COMPANY_AQUARIUM_CLEAN_REGEX 2018-04-21 00:58:42 +02:00
Laurent Destailleur
38d200d8a6 Fix left menu 2018-04-20 13:23:34 +02:00
Laurent Destailleur
7baf0eddbc NEW Add hidden option COMPANY_AQUARIUM_CLEAN_REGEX to clean generated 
accounting account.
 2018-04-20 01:10:57 +02:00
Laurent Destailleur
16e27a445b Sort type of email template combo list 2018-04-19 20:42:03 +02:00
Laurent Destailleur
72de21537c Clean code 2018-04-15 20:09:09 +02:00
Laurent Destailleur
698f5c165a
Merge pull request #8430 from atm-florian/dev_mailtouser 
NEW : Can select from the user list into send form email (For field to and CC)
 2018-04-11 17:55:40 +02:00
Laurent Destailleur
ea35a445a1
Merge branch 'develop' into 8.0-a15 2018-04-11 13:17:12 +02:00
Laurent Destailleur
bf1e3705fb Fix english 2018-04-11 12:47:10 +02:00
Laurent Destailleur
a06c9df86c Fix translation 2018-04-10 16:01:32 +02:00
John
24bf8cb162 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents 2018-04-09 16:21:37 +02:00
Laurent Destailleur
98b9f6bb47 DAV module 2018-04-07 19:12:41 +02:00
Alexandre SPANGARO
741a14993a NEW Add file number in accountant card and update export filename 2018-04-07 06:21:49 +02:00
florian HENRY
cc0fb830b8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser 2018-04-05 10:53:17 +02:00
Marc de Lima Lucio
9ba902504e FIX: langs 2018-03-29 09:38:16 +02:00
Laurent Destailleur
8102ae6705 Work on setup for vat of product payments 2018-03-25 18:25:52 +02:00
florian HENRY
ffbeb17ec2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser 2018-03-25 17:19:27 +02:00
Laurent Destailleur
7363ae17ee Move setup of email for module module into email templates 2018-03-23 16:09:46 +01:00
florian HENRY
dc6f4c1f4d NEW : option to send email to salaries 2018-03-21 11:48:30 +01:00
Laurent Destailleur
d7ad899839 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/conf.class.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/holiday/list.php
 2018-03-20 14:52:27 +01:00
Laurent Destailleur
0dc8d3cb00 Fix trad 2018-03-19 18:53:33 +01:00
Alexandre SPANGARO
93b087dbe0 NEW Add a tab to specify accountant/auditor of the company 2018-03-18 06:09:50 +01:00
Laurent Destailleur
60283a8205 Remove file incoterm.lang 2018-03-13 18:07:58 +01:00
Marc de Lima Lucio
d6b4bc14e4 NEW: syslog file autoclean 2018-03-09 16:52:06 +01:00
Laurent Destailleur
fab007ad83 Remove deprecated option dolibarr_pdf_force_fpdf 
Fix view of dolibarr setup config file
 2018-03-07 09:41:27 +01:00
Laurent Destailleur
03858d73b1 NEW Add extrafield type "html" 2018-02-27 17:30:13 +01:00
Laurent Destailleur
863cab362f NEW Cat set the encryption algorithm for extrafields of type password 2018-02-23 14:38:41 +01:00
Laurent Destailleur
b87feab1e3 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-02-22 12:19:20 +01:00
Laurent Destailleur
48d250b201 Help to understand 2018-02-20 15:55:58 +01:00
John
46b235c139 add auto select model when select type on create invoice 2018-02-20 15:08:57 +01:00
Laurent Destailleur
1ee128ff13 NEW Add type of website container/page into dictionary 2018-02-19 19:48:53 +01:00
Laurent Destailleur
60fe1fa503 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/mails.php
 2018-02-17 01:19:17 +01:00
Laurent Destailleur
46c941c823 Translation 2018-02-16 23:57:35 +01:00
Laurent Destailleur
5c5d2cbefa Fix smtp warning message 2018-02-16 23:49:08 +01:00
Laurent Destailleur
a4b155fc91 Fix typo and 2018-02-16 20:42:40 +01:00
Laurent Destailleur
6b74c79798 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/website.lang
 2018-02-15 15:34:17 +01:00
Laurent Destailleur
5eee292663 FIX #8189 2018-02-15 13:40:17 +01:00
Laurent Destailleur
d24d401f3a Fix translation 2018-02-04 10:55:09 +01:00
Laurent Destailleur
7c6c893657
Merge pull request #7996 from atm-maxime/new_force_mailto 
NEW Option to force all emails recipient
 2018-02-03 19:15:11 +01:00
Laurent Destailleur
e9f8c7ba01 Fix edit of extrafields "link" corrupts the data definition 2018-01-31 10:51:40 +01:00
Laurent Destailleur
4f9f1b51d7 Fix translation 2018-01-26 01:34:49 +01:00
Laurent Destailleur
cff1dc6827 Rename 2018-01-25 17:57:49 +01:00
Laurent Destailleur
e9441f7881 Fix name of log module to avoid confusion with blocked log 2018-01-25 17:56:46 +01:00
Laurent Destailleur
9d0a0ed867 Fix demo 2018-01-19 12:55:03 +01:00
Laurent Destailleur
534cbcb941 Debug translation 2018-01-03 20:59:35 +01:00
Maxime Kohlhaas
d770f73219 Add option translation 2017-12-26 16:21:15 +01:00
Laurent Destailleur
98b82d712a NEW Revenue stamp can be a percent 
FIX Revenue stamp not visible on the transfer payment page
 2017-12-18 12:43:03 +01:00
Laurent Destailleur
fcf50c01b9 Fix translation 2017-12-16 15:33:29 +01:00
alexis Algoud
a2df87ab15 NEW warning on module blocked log reset if country code is FR 
fix wrong paste click
 2017-12-05 11:40:42 +01:00
Laurent Destailleur
0a73daba01 Security: on target=_blank, we must have rel="noopener" 2017-12-02 03:04:52 +01:00
Laurent Destailleur
a0231b5c60 Fix responsive 2017-12-01 12:55:28 +01:00
Laurent Destailleur
a15a57317b Debug accountancy module 2017-11-28 11:12:13 +01:00
Laurent Destailleur
a9d3e90b70 Big debug of accountancy module 2017-11-27 21:53:22 +01:00
Laurent Destailleur
3d48e509bd Clean code 2017-11-25 19:16:15 +01:00
Laurent Destailleur
fa92c53ff6 Fix pb when showing dictionaries 2017-11-14 11:13:24 +01:00
Laurent Destailleur
1db68b2a32 Translation 2017-10-31 19:37:41 +01:00
Laurent Destailleur
b11727885e Translation 2017-10-30 01:44:18 +01:00
Laurent Destailleur
1426737a26 Work on website 2017-10-21 12:26:14 +02:00
Laurent Destailleur
3bca0ad07d More modern picto for switch on/off 
Work on website module
 2017-10-20 21:39:19 +02:00
Laurent Destailleur
5c189449e1 Move default value for user expense report on tab expense report 2017-10-20 17:02:26 +02:00
Laurent Destailleur
413807708f Move translation key into main file 2017-10-19 20:59:36 +02:00
Laurent Destailleur
8113321062 Start to work on email sender profiles 2017-10-13 12:02:26 +02:00
Laurent Destailleur
0b7aa20464 Add link to ChangeLog 2017-10-09 22:52:26 +02:00
Laurent Destailleur
3b6f6c4027 Translation 2017-10-09 19:51:42 +02:00
Laurent Destailleur
6402d5a2e4 Fix translation 2017-10-09 13:30:08 +02:00
Laurent Destailleur
33624e1001 NEW Attaching doc automatically in email is now a parameter of template. 2017-10-08 16:34:42 +02:00
Laurent Destailleur
ce7ce82801 Enhance email template editor 2017-10-08 14:51:10 +02:00
Laurent Destailleur
10142522e0 Fix typo 2017-10-04 13:30:43 +02:00
Laurent Destailleur
3f3a5e0921 Merge pull request #7499 from atm-gauthier/NEW_custom_meteo 
New custom meteo
 2017-10-02 00:48:52 +02:00
Laurent Destailleur
3ddd5d3d3a The default value feature is sensitive to url parameters. 2017-10-01 14:54:17 +02:00
Laurent Destailleur
74a2a4c257 Better translation 2017-09-26 12:34:18 +02:00
gauthier
79049f55b7 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_custom_meteo 2017-09-26 09:56:00 +02:00
gauthier
3cec308586 NEW : langs 2017-09-25 17:19:56 +02:00
Regis Houssin
791c385e5b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_ldap

Conflicts:
	htdocs/adherents/card.php
 2017-09-22 20:26:22 +02:00
Laurent Destailleur
f990667b1a NEW Can send email from the member card using email templates. 2017-09-22 17:48:38 +02:00
Regis Houssin
f550e27579 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-09-18 12:15:01 +02:00
Laurent Destailleur
3f7b705674 Use correct term accounting for codes 2017-09-18 00:48:09 +02:00
Regis Houssin
bdc425c203 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-09-16 21:41:55 +02:00
Regis Houssin
87b81fb2fd NEW add members types ldap group management 2017-09-16 21:41:30 +02:00
Laurent Destailleur
9077b5f374 Translation 2017-09-16 12:48:51 +02:00
Laurent Destailleur
8773a6860f Fix HTML5 use of <br> is preferred to <br /> 2017-09-15 23:49:04 +02:00
Laurent Destailleur
ed9c401ca6 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-14 12:20:26 +02:00
Laurent Destailleur
205989b64b Fix phpunit 2017-09-14 09:16:57 +02:00
Laurent Destailleur
1a056d29d2 Debug search on dolistore 2017-09-12 21:02:18 +02:00
Inovea Conseil
f0e0df2660 add translation publisher 
translation for modulehelp.php
 2017-09-12 16:29:06 +02:00
Laurent Destailleur
fcf82f1163 Enhancement into setup of member module 2017-09-12 11:17:23 +02:00
Laurent Destailleur
75172966c2 Fix selection of email templates 2017-09-08 14:40:39 +02:00
Laurent Destailleur
259cca0230 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/admin/mails_templates.php
 2017-09-08 13:30:54 +02:00
Laurent Destailleur
bde293af22 Fix filter on extrafield with type sellist 2017-09-07 15:34:25 +02:00
Laurent Destailleur
a0cdf784da Standardize code 2017-09-05 09:43:22 +02:00
Laurent Destailleur
4b9f54e571 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/data/llx_accounting.sql
	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
	htdocs/install/mysql/tables/llx_holiday_config.sql
 2017-09-01 17:34:57 +02:00
Laurent Destailleur
3e4a7ba97c Update admin.lang 2017-08-30 16:46:50 +02:00
Laurent Destailleur
2c4e8cbb4a Update admin.lang 2017-08-30 16:45:53 +02:00
Juanjo Menent
bfc5f01e1e NEW Add detail of all tax rates into pdf column tax sale. 
-Can be hidden by pdf setup page
-For know if localtax is applied into line we have to read totaltax line
 2017-08-30 14:36:00 +02:00
Maxime Kohlhaas
a288ee65e0 Add lang trans 2017-08-27 18:02:35 +02:00
Laurent Destailleur
76b4a2ce06 Can set language file to use for label key of extra field 2017-08-27 12:52:26 +02:00
Laurent Destailleur
b3f77ed9f7 Merge pull request #7276 from atm-john/new_develop_extrafields_facture_rec 
NEW extrafield on facture_rec
 2017-08-26 19:26:09 +02:00
Laurent Destailleur
5ed22b64fb Show if module add objects tables 2017-08-26 16:04:24 +02:00
Laurent Destailleur
632119a5c5 Show if module add dictionary data 2017-08-26 15:46:35 +02:00
John
0653a5d177 Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_develop_extrafields_facture_rec 2017-08-24 14:35:01 +02:00
Laurent Destailleur
326d3df63f FIX select of category 
FIX pb with extrafield list and key '0'

Conflicts:
	htdocs/core/class/extrafields.class.php
 2017-08-24 13:28:56 +02:00
Laurent Destailleur
7da6f93d7e FIX select of category 
FIX pb with extrafield list and key '0'
 2017-08-24 13:23:15 +02:00
John
b18104788e New extrafield on facture_rec 2017-08-22 15:22:41 +02:00
Laurent Destailleur
14cd150762 NEW Introduce experimental feature to search dolistore from application 2017-08-22 14:47:01 +02:00
Laurent Destailleur
4f6363bff8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-21 00:49:47 +02:00
Laurent Destailleur
1101a1094f Fix translation and migration 2017-08-20 16:07:38 +02:00
Laurent Destailleur
5c5c4046a1 Prepare setup for email reminder 2017-08-20 16:07:22 +02:00
Laurent Destailleur
00a1893d93 Better help 2017-08-03 12:04:13 +02:00
Laurent Destailleur
c43df7cda8 Fix translation 2017-08-02 22:47:06 +02:00
atm-ph
1f3f9e40b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report 2017-07-27 16:01:53 +02:00
Laurent Destailleur
7562412554 Minor fixes 2017-07-22 01:21:28 +02:00
Laurent Destailleur
fa00373e56 Fix remove log 2017-07-15 17:52:30 +02:00
Laurent Destailleur
1735a649e9 Fix permission on salary module 2017-07-15 13:02:41 +02:00
Laurent Destailleur
23fbef3dae Fix the delete dir functions does not return real nb of deleted files. 2017-07-13 00:26:05 +02:00
Laurent Destailleur
0d4d4516c8 Fix template for css and js 2017-07-12 22:52:56 +02:00
Laurent Destailleur
a487492a7a Fix purge of log files was missing some log files. 2017-07-12 20:23:35 +02:00
Laurent Destailleur
9fc17d8988 Translation 2017-07-09 13:43:23 +02:00
phf
b8865c425f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report 2017-07-05 10:48:01 +02:00
phf
1beec51928 New expense report rules and ik (index kilometers) - MAIN_USE_EXPENSE_IK - MAIN_USE_EXPENSE_RULE 2017-07-05 10:44:52 +02:00
Laurent Destailleur
fcdc7b1a0d Fix pgsql compatibility 2017-06-20 01:53:34 +02:00
Laurent Destailleur
8a1de52f3c Fix translation 2017-06-17 12:00:33 +02:00
Laurent Destailleur
a4f34539ea Fix translation 2017-06-17 11:46:45 +02:00
Laurent Destailleur
7c41c9a3e4 Fix activation of dependency for a dedicated country. 
BlockedLog depends now on CashDesk only.
 2017-06-17 11:43:00 +02:00
Laurent Destailleur
1c8daf9700 Standardize and debug code of module BlockedLog 2017-06-16 12:46:15 +02:00
Laurent Destailleur
542a72c684 NEW custom dir is enabled dy default on first install. 
Fix modulebuilder when custom dir not defined.
 2017-06-10 23:50:46 +02:00
Laurent Destailleur
58a407d9f1 Fix style and align when no permission on widget 2017-06-10 00:05:47 +02:00
Laurent Destailleur
1820649175 Maxi debug of v6 2017-06-07 19:28:31 +02:00
Laurent Destailleur
a0295821ba Fix errors in extra computed field 2017-06-07 11:38:42 +02:00
Laurent Destailleur
c59d216cf5 NEW Can read time spent of others (hierarchy only or all if granted) 2017-06-02 13:24:45 +02:00
Laurent Destailleur
77df19009d Removed duplicated code 2017-06-01 12:11:45 +02:00
Laurent Destailleur
e5fe629a0e NEW Extrafields support formulas to be computed using PHP expressions 2017-05-24 22:48:44 +02:00
Laurent Destailleur
d1c4439a0f Merge pull request #6858 from OPEN-DSI/module_agenda_linked_object_option 
NEW Module Agenda: Add option - Show linked object into agenda view
 2017-05-19 17:23:54 +02:00
Laurent Destailleur
2a0a0f12f3 Merge pull request #6867 from OPEN-DSI/core_dict_actioncomm_modify_color_position 
NEW Core dictionaries: Adds the ability to change the color and position …
 2017-05-19 16:33:05 +02:00
Laurent Destailleur
4e7353f8a0 Clean code 2017-05-19 13:39:00 +02:00
KHELIFA
2382a0a4ee Core dictionaries: Adds the ability to change the color and position of the dictionary 'Types of agenda events' 2017-05-19 10:46:29 +02:00
KHELIFA
169859b708 Module Agenda: Add option - Show linked object into agenda view 2017-05-17 17:00:45 +02:00
Laurent Destailleur
789fbb6dc3 Enhance tooltips 2017-05-15 12:57:08 +02:00
Laurent Destailleur
f6dcb2860a More complete help message 2017-05-12 19:14:54 +02:00
Laurent Destailleur
9fe28c9b2c NEW Can disable all overwrote translations in one click. 2017-05-09 10:08:04 +02:00
Laurent Destailleur
910a925167 NEW Add last activation author and ip of modules 2017-05-06 20:43:14 +02:00
Laurent Destailleur
d948447600 Add button to disable all personalized default values in one click. 2017-05-06 17:08:38 +02:00
Laurent Destailleur
56140ae572 Work on default focus 2017-05-06 01:09:22 +02:00
Laurent Destailleur
b7f7683e5a Merge pull request #6774 from aspangaro/6.0-multijournal 
Finish to move accountancy journals list to page like dictionnary
 2017-05-05 14:21:55 +02:00
Laurent Destailleur
68b63927e0 Maxi miscellaneous debug 2017-05-05 12:33:49 +02:00
Laurent Destailleur
f069ef9844 FIX #6767 2017-05-05 09:16:11 +02:00
Laurent Destailleur
6e1f825190 Look and feel v6 2017-05-01 13:01:05 +02:00
Alexandre SPANGARO
6afd0d642a Finish to move accountancy journals list to page like dictionnary 2017-05-01 08:16:09 +02:00
Laurent Destailleur
60951cf307 Less data example 2017-04-30 04:09:50 +02:00
Laurent Destailleur
2e6d865c7d NEW Can define default values for create forms. 
NEW Can define default filters for list pages.
NEW Can define default sort order for list pages.
 2017-04-29 00:44:25 +02:00
Laurent Destailleur
defce63a24 Work on management of default values 2017-04-28 14:05:28 +02:00
Laurent Destailleur
cfde27820e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/translation.php
	htdocs/comm/card.php
	htdocs/core/menus/standard/eldy.lib.php
 2017-04-27 17:20:40 +02:00
Laurent Destailleur
9c2ce0202d Translation 2017-04-27 13:19:36 +02:00
Laurent Destailleur
1a98c4a3ff Fix error management in adding translation key 2017-04-27 12:48:13 +02:00
Laurent Destailleur
508109d5b1 Translation 2017-04-27 00:21:00 +02:00
Laurent Destailleur
b0442aa56a Better explanation on label that are translated. 2017-04-14 19:48:01 +02:00
Laurent Destailleur
e6e9b65594 NEW Reduce memory usage by removing deprecated constant loading. 2017-04-14 12:38:52 +02:00
Laurent Destailleur
d15792bdf4 Minor fix 2017-04-11 00:59:47 +02:00
Laurent Destailleur
f1ae0eb7c6 Default value 2017-04-10 12:51:52 +02:00
Laurent Destailleur
76af83ce06 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-04-08 14:06:25 +02:00
Laurent Destailleur
7f7ba6279a Fix translation 2017-04-08 14:02:07 +02:00
Laurent Destailleur
f598bf8bef Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-04-06 21:59:11 +02:00
Laurent Destailleur
e2b96abd0b Fix translation 2017-04-05 13:34:52 +02:00
Laurent Destailleur
979bcd3a9b NEW Can add a background image on login page 2017-03-31 11:40:31 +02:00
Laurent Destailleur
18e1e5b780 NEW Add "depends on" and "required by "into module informations 2017-03-30 15:54:48 +02:00
Laurent Destailleur
78cc976e9f Work on module builder 2017-03-30 10:40:15 +02:00
Laurent Destailleur
219bcb0d54 Work on 6.0 features. 2017-03-27 22:44:50 +02:00
Laurent Destailleur
3cc312d485 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/main.lang
 2017-03-23 19:48:34 +01:00
Laurent Destailleur
c4b6378751 Fix english translation 2017-03-23 16:46:00 +01:00
Laurent Destailleur
3adb43c6e5 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/boxes/box_produits.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/langs/en_US/bills.lang
	htdocs/product/class/product.class.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
 2017-03-23 12:52:19 +01:00
Laurent Destailleur
a5c11dc840 NEW Add function dolMd2Html 2017-03-21 16:03:13 +01:00
Laurent Destailleur
4457bc33cd Fix english translation 2017-03-21 14:23:55 +01:00
Laurent Destailleur
967f3f579d Fix translation 2017-03-18 20:07:37 +01:00
Laurent Destailleur
c962daabac NEW add property to show warnings when activating modules 2017-03-09 15:16:16 +01:00
Laurent Destailleur
5f79b2d0c6 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/accountancy/admin/categories.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2017-03-05 22:11:35 +01:00
Laurent Destailleur
f67c967d0b FIX The vat rate line used when adding a predefined product was wrong if 
there is several vat line with same rate.
 2017-03-04 22:27:44 +01:00
Laurent Destailleur
d5bb208957 Clean admin menu entries 2017-02-22 02:19:50 +01:00
Laurent Destailleur
eef3824f8c Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/categories.php
	htdocs/admin/dict.php
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/bills.lang
 2017-02-21 10:34:52 +01:00
Laurent Destailleur
89d10ae5aa Fix the accounting account groups must be editable by book keeper, not 
admin user.
 2017-02-20 11:21:38 +01:00
Laurent Destailleur
fd111cb1c6 NEW tooltip can be on hover or on click with textwithpicto function. 2017-02-17 17:11:14 +01:00
Laurent Destailleur
05c9f57fd4 Move edition of emails templates out of dictionaries so we would be able 
to have templates per user (not reserved to admin).
 2017-02-12 18:13:49 +01:00
Laurent Destailleur
f34e0b1bdb NEW Can deploy an external module from the module setup area. 2017-02-11 15:41:01 +01:00
Laurent Destailleur
4723eac227 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-11 13:56:39 +01:00
Laurent Destailleur
b9db7eba1b Fix: deployement of a module 2017-02-10 19:14:58 +01:00
Laurent Destailleur
f6a8aacc8d Fix: deployement of a module 2017-02-10 18:42:59 +01:00
Laurent Destailleur
97eebe164c Better translation 2017-02-10 17:09:56 +01:00
Laurent Destailleur
44ab6ad9b7 NEW Can control constants values into file integrity checker 2017-02-10 17:05:45 +01:00
Laurent Destailleur
596c092ec8 Merge pull request #6219 from atm-florian/dev_changelistchild 
NEW : Allow extrafields list select to be dependands on other standard list and not only other extrafields list
 2017-02-08 16:49:18 +01:00
Laurent Destailleur
31c3398b7f Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/modules.php
 2017-02-08 10:59:05 +01:00
Laurent Destailleur
0a797cd12e Fix us terms. 2017-02-07 20:08:15 +01:00
Laurent Destailleur
b0ee04c079 FIX #6379 2017-02-07 01:13:50 +01:00
Laurent Destailleur
9220a638b5 NEW Filechecker can include custom dir and report added files. 2017-02-06 15:29:07 +01:00
Laurent Destailleur
6cb3199824 Translation message 2017-02-06 12:03:20 +01:00
Laurent Destailleur
f9c510f4fb More complete translation 2017-02-04 11:34:29 +01:00
florian HENRY
cb6209de31 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_changelistchild

Conflicts:
	htdocs/core/class/commonobject.class.php
 2017-01-27 15:16:28 +01:00
Laurent Destailleur
053afe21dd Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/class/user.class.php
 2017-01-26 23:40:16 +01:00
Laurent Destailleur
60ac751d84 Fix translation 2017-01-26 18:21:39 +01:00
florian HENRY
d714a52f95 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_changelistchild

Conflicts:
	htdocs/core/class/commonobject.class.php
 2017-01-23 11:35:11 +01:00
Laurent Destailleur
5fd8b1efcb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-22 21:23:35 +01:00
Laurent Destailleur
db220e7af5 FIX Rename api_key into DOLAPIKEY to allow to use it on http header. 2017-01-22 20:55:26 +01:00
Laurent Destailleur
809e3ce4d5 Debug browser notification 2017-01-20 20:10:16 +01:00
Juanjo Menent
2374aa351e Merge remote-tracking branch 'upstream/develop' into develop 2017-01-20 15:55:51 +01:00
Laurent Destailleur
412be59f78 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-01-20 12:09:39 +01:00
Laurent Destailleur
8ec1784e41 Better translation 2017-01-20 09:46:36 +01:00
Laurent Destailleur
4ecd657f34 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-16 00:02:43 +01:00
Laurent Destailleur
6aa26e0f62 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/product/stock/massstockmove.php
	htdocs/projet/info.php
	htdocs/projet/tasks/time.php
	htdocs/societe/class/societe.class.php
 2017-01-13 16:49:18 +01:00
Juanjo Menent
6cc3ef0c99 NEW: Events notifications in browser 2017-01-13 16:08:49 +01:00
Laurent Destailleur
f185a09693 FIX Security access problem with external users on projects/tasks 2017-01-12 15:26:00 +01:00
Laurent Destailleur
f00f3101d9 Merge pull request #6013 from aljawaid/develop 
NEW: Make Top Menu Entries Independent Translation Strings
 2017-01-07 20:45:44 +01:00
Laurent Destailleur
358616cda2 Fix link should be https 2017-01-07 15:18:57 +01:00
Laurent Destailleur
c5850d29e7 Fix checksum integrity. Also add a global checksum. 2016-12-26 19:51:24 +01:00
Laurent Destailleur
83a8fcb7f9 Fix filecheck tool. 2016-12-26 19:01:24 +01:00
Laurent Destailleur
c16489a3c0 Fix add message to explain why some emails fails 2016-12-25 23:14:51 +01:00
florian HENRY
337897e0a1 NEW : Allow extrafields list select to be dependands on other standard 
list and not only other extrafields list
 2016-12-23 15:01:49 +01:00
Laurent Destailleur
788cbf9a01 Complete work on dol_banner on contracts 2016-12-04 13:30:17 +01:00
Laurent Destailleur
16ce156631 Fix responsive design 2016-11-25 18:32:52 +01:00
aspangaro
638563dc5d Fix missing language key in holiday type dictionary 2016-11-22 05:54:44 +01:00
aspangaro
38a31cbd28 Fix missing key language in dictionary email models 2016-11-22 05:25:08 +01:00
IJ
b631db1d60 New: Add Hidden Options Quick Reference Link 
Add the dolibarr wiki link for quick reference from the page Setup>Other Setup
 2016-11-22 02:29:25 +00:00
aspangaro
213e7d1cd7 Fix Missing language key for dictionary format card 2016-11-21 21:49:08 +01:00
Laurent Destailleur
1c17335d34 FIX Move translation key in correct file 2016-11-20 18:19:39 +01:00
Laurent Destailleur
a369514e46 Tooltip help better 2016-11-13 20:43:34 +01:00
Laurent Destailleur
348e004da6 Minor fixes in css 2016-11-12 16:39:08 +01:00
Laurent Destailleur
9fd5ddf807 NEW Add REST API for projects 2016-11-09 22:54:51 +01:00
Laurent Destailleur
6d70d39bbd NEW Add type "url" as possible extrafield. 2016-11-08 17:21:26 +01:00
Laurent Destailleur
32b6660f63 Uniformize code 2016-10-29 16:18:39 +02:00
Laurent Destailleur
d27ffd4194 Merge pull request #5393 from frederic34/patch-10 
NEW Add admin parameter BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDE for supplier order
 2016-10-26 11:48:02 +02:00
Laurent Destailleur
b15535c1f1 Uniformize code 2016-10-25 02:04:46 +02:00
Laurent Destailleur
fdcc858008 Merge branch 'dev_resource_extrafields' of 
https://github.com/atm-florian/dolibarr into
atm-florian-dev_resource_extrafields

Conflicts:
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-10-24 02:05:34 +02:00
Laurent Destailleur
9eafff4a97 Debug module accounting 2016-10-21 17:41:05 +02:00
florian HENRY
54a154fa4f NEW : Add ressource extrafields 2016-10-19 22:14:51 +02:00
Laurent Destailleur
04c0e87d79 Work on accounting module 2016-10-15 15:51:28 +02:00
Laurent Destailleur
48ce299a38 NEW Option MAIN_INFO_SOCIETE_MAIL_ALIASES to use different identities. 2016-10-15 03:45:23 +02:00
Laurent Destailleur
dfbca2d0ad Merge pull request #5868 from olsesacl/#5830 
NEW: #5830 Allow Generic E-mail Sender
 2016-10-15 02:43:19 +02:00
Laurent Destailleur
79d376ee12 Debug accountancy module 2016-10-14 13:05:01 +02:00
Sergio Sanchis Climent
8556dab68e NEW: #5830 2016-10-13 16:44:17 +02:00
Laurent Destailleur
92423be43d Fix english 2016-10-11 15:03:56 +02:00
Laurent Destailleur
d0eb636051 Fix records is always singular 2016-10-11 14:50:32 +02:00
Laurent Destailleur
e7a09c07f9 Sync and clean language files 2016-10-11 10:38:38 +02:00
Laurent Destailleur
269b9ea2ea Fix translation thirdparty -> third party 2016-10-10 15:15:54 +02:00
Laurent Destailleur
74f2a4d597 Enable feature to check online signature 2016-10-09 20:20:24 +02:00
Laurent Destailleur
03876ba637 Merge pull request #5773 from atm-gauthier/NEW_reopen_bills_is_a_distinct_right 
NEW : Reopen a paid bill is a user right
 2016-10-07 13:31:10 +02:00
Laurent Destailleur
77e87b3c07 NEW Add tooltip in payment term edition in dictionnary 2016-10-07 00:37:06 +02:00
gauthier
b35a4eb1b2 Merge branch 'NEW_cdr_current_or_next_month' of github.com:atm-gauthier/dolibarr into develop_NEW_cdr_current_or_next_month 2016-10-04 16:01:26 +02:00
gauthier
1c98979ca1 NEW : option "Current/Next" for limit payment date (in payment terms) to use a specific day of current month or jump to same day of next month 2016-10-04 15:45:23 +02:00
Laurent Destailleur
a52ad545eb Enhancement on module Direct Debit SEPA. 2016-10-02 13:03:45 +02:00
Laurent Destailleur
e3aa84ff5a NEW Add last activation date as info in module list. 2016-10-02 10:41:22 +02:00
Laurent Destailleur
c9792ff047 Fix translation 2016-10-01 20:12:00 +02:00
Laurent Destailleur
20ad359c9b FIX Warning to grant permission must be visible only if one module add 
some permissions
 2016-09-30 18:26:32 +02:00
Laurent Destailleur
287f9972a8 Merge branch 'new_no_default_rights' of 
https://github.com/atm-maxime/dolibarr into
atm-maxime-new_no_default_rights

Conflicts:
	htdocs/langs/en_US/admin.lang
 2016-09-30 13:04:14 +02:00
Laurent Destailleur
504ee9c73e NEW Add system tool "Files integrity checker" to detect modified files 
for packaged versions.
 2016-09-30 12:01:06 +02:00
Laurent Destailleur
e99f115a8f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/tables/llx_user.sql
 2016-09-28 19:49:36 +02:00
Laurent Destailleur
586b223221 Work on remote integrity checker 2016-09-26 15:24:43 +02:00
gauthier
7ad2fda289 NEW : Reopen a paid bill is a user right 2016-09-22 15:06:39 +02:00
Laurent Destailleur
9ff1809f85 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/card.php
	htdocs/product/stock/class/productlot.class.php
	htdocs/theme/eldy/style.css.php
 2016-09-12 02:05:38 +02:00
Laurent Destailleur
66cf9e333e Fix option MAIN_BUTTON_HIDE_UNAUTHORIZED 2016-09-10 02:58:46 +02:00
aspangaro
37c7d49537 Presentation of fiscal year 2016-09-06 22:42:15 +02:00
Laurent Destailleur
6da7410c18 Show warning for overwritten translation 2016-09-04 14:58:58 +02:00
Laurent Destailleur
d24045d831 NEW Editing translation GUI become easier with search translation tool. 2016-09-04 14:45:43 +02:00
Laurent Destailleur
0e4b4ee321 Merge branch 'develop-external-logging' of 
https://github.com/GPCsolutions/dolibarr into
GPCsolutions-develop-external-logging

Conflicts:
	composer.json
 2016-09-02 21:51:25 +02:00
Laurent Destailleur
330e494eda NEW Can filter on fields on admin translation page 2016-08-28 22:46:09 +02:00
Raphaël Doursenaud
49cb61b530
CLOSE #5627 Allowed external logging modules. 
Removed Sentry logging.
 2016-08-16 03:24:04 +02:00
Laurent Destailleur
034b08ce56 NEW Add option "Hide images in Top menu". 2016-08-05 23:40:00 +02:00
Laurent Destailleur
33d12a4492 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/admin.lang
 2016-08-05 01:15:19 +02:00
Laurent Destailleur
4b5cae0af8 Fix help 2016-08-04 17:09:49 +02:00
Laurent Destailleur
5126786d60 NEW Add option SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED 2016-08-04 15:48:34 +02:00
Laurent Destailleur
182338beb1 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-04 10:27:50 +02:00
Laurent Destailleur
11ab49d85d Fix bad help 2016-08-04 10:27:19 +02:00
Laurent Destailleur
b267402df6 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/main.lang
	htdocs/societe/rib.php
 2016-08-01 15:15:32 +02:00
Laurent Destailleur
0414f09e48 Fix permissions 2016-07-30 21:09:30 +02:00
Laurent Destailleur
b3dab8a6f7 Better translation 2016-07-30 11:56:22 +02:00
Laurent Destailleur
ff9d6ce02a Fix missing translation 2016-07-29 23:02:40 +02:00
Laurent Destailleur
8b3136cb96 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/companies.lang
 2016-07-27 19:04:55 +02:00
Laurent Destailleur
3b1d6818b8 Update ldap translation 2016-07-27 17:26:04 +02:00
Laurent Destailleur
3d2dc3c66e NEW Each user can select its landing page. 2016-07-26 21:12:52 +02:00
Laurent Destailleur
a167d56d5a Hard code a warning to avoid confusion. 2016-07-26 16:40:37 +02:00
Laurent Destailleur
3265b7028d Merge remote-tracking branch 'origin/4.0' into develop 2016-07-25 19:53:28 +02:00
Laurent Destailleur
867a0072e3 Fix forcing on module setup was not working 2016-07-23 13:20:34 +02:00
Laurent Destailleur
af09528738 NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and 
__AMOUNT_WO_TAX__ into emails templates.
 2016-07-21 20:45:30 +02:00
Laurent Destailleur
93bb929219 Merge pull request #5405 from atm-florian/dev_new_password_extrafeilds_type 
NEW : Add new password extrafields type
 2016-07-21 14:01:07 +02:00
Laurent Destailleur
5e654e8cb3 Fix help 2016-07-18 11:49:34 +02:00
Laurent Destailleur
9ba1ca5acb Merge branch 'abb-14' of https://github.com/bafbes/dolibarr into bafbes-abb-14 
Conflicts:
	htdocs/langs/en_US/companies.lang
 2016-07-15 17:05:12 +02:00
Laurent Destailleur
24a798ed2f Fix restore translation for ModuleCompanyCode... 2016-07-07 14:13:33 +02:00
florian HENRY
2d932066c7 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_new_password_extrafeilds_type 2016-07-07 09:17:39 +02:00
Laurent Destailleur
5713d293e3 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2016-07-01 03:22:16 +02:00
Laurent Destailleur
102179028c FIX #5414 2016-07-01 03:11:41 +02:00
florian HENRY
52f2e228f1 Add new password extrafields type 2016-06-28 10:21:10 +02:00
Laurent Destailleur
a8ba8e612a Missing translation 2016-06-25 15:56:03 +02:00
Laurent Destailleur
266fef40ad Add a way to enhance security check. 2016-06-25 15:16:32 +02:00
Frédéric FRANCE
846c4855a8 Update admin.lang 2016-06-23 18:22:32 +02:00
Laurent Destailleur
7fbbf7e8f0 Fix translation missing 2016-06-22 20:09:20 +02:00
Laurent Destailleur
de76f2a9aa Clean language files 2016-06-18 15:50:37 +02:00
Laurent Destailleur
d192438eae Enhance tool to clean language files 2016-06-18 12:50:15 +02:00
Laurent Destailleur
5b5b7a2bf9 FIX Bad value used for task warning delay 
FIX Compatibility datee and date_end for warning of tasks
 2016-06-15 14:05:48 +02:00
Laurent Destailleur
293c8e145a Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/imports/import.php
	htdocs/langs/en_US/admin.lang
 2016-06-05 02:20:27 +02:00
Laurent Destailleur
c09dbe05b3 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/class/ldap.class.php
	htdocs/expensereport/card.php
	htdocs/langs/en_US/admin.lang
 2016-06-05 00:25:08 +02:00
Laurent Destailleur
db2269b9dd Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/class/ldap.class.php
	htdocs/langs/en_US/admin.lang
 2016-06-05 00:12:34 +02:00
novalore
2d907bc727 miscellaneous lang fixes in en_US 2016-06-04 17:34:23 +02:00
phf
a62f5bd5b4 Fix #2777 2016-06-04 17:17:22 +02:00
Laurent Destailleur
674164b71c Add a better explanation on job generation 2016-06-04 14:30:05 +02:00
Maxime Kohlhaas
d777fca0b9 Warning messages after module activation and for user with no permission 2016-06-04 13:25:39 +02:00
novalore
3ee8f931b4 other fixes in en_US lang files 2016-06-04 02:16:58 +02:00
Laurent Destailleur
b57476153f Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/admin/menus/edit.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/societe/consumption.php
 2016-06-04 01:14:36 +02:00
novalore
1227ee5eb6 Miscellaneous typos and errors in en_US lang files 2016-06-04 00:14:56 +02:00
Laurent Destailleur
780d1628a9 Missing trans 2016-06-01 21:19:21 +02:00
Laurent Destailleur
c653acd4ce Minor fixes 2016-05-27 14:56:59 +02:00
Laurent Destailleur
b476153b8b Move POS at end of top menu 2016-05-25 00:02:48 +02:00
Laurent Destailleur
a587ba496c NEW Can select fields on supplier orders 2016-05-24 18:43:35 +02:00
Laurent Destailleur
5fd64c81a6 Missing translation 2016-05-21 12:21:17 +02:00
Laurent Destailleur
fd38db388a Rename box into widget 2016-05-19 10:05:02 +02:00
Laurent Destailleur
ca37a90a1b Better explanation 2016-05-05 22:26:42 +02:00
Laurent Destailleur
d2df537d43 Merge pull request #5135 from atm-alexis/develop_NEW_allow_link_project 
NEW allow a document to be linked to project from another customer
 2016-05-05 22:24:32 +02:00
Laurent Destailleur
46e2ed2810 NEW: All variant of ckeditor config can be tested into the setup page of 
module.
 2016-05-01 20:36:42 +02:00
Laurent Destailleur
4e9ea2786a Fix s 2016-04-30 01:43:34 +02:00
Laurent Destailleur
e8bd1357f3 More help to use REST API 2016-04-30 00:00:59 +02:00
Alexis Algoud
e5b6d39e51 NEW allow a document to be linked to project from another customer on config 2016-04-29 18:04:59 +02:00
Laurent Destailleur
357877b1fe Debug multicurrency and clean properties of some modules 2016-04-12 14:45:59 +02:00
Laurent Destailleur
010a4f8929 Merge pull request #4945 from frederic34/shipcust 
NEW : Select Preferred Sending Method for a third party
 2016-04-08 21:31:06 +02:00
Laurent Destailleur
eb7bba9568 Fix translation 2016-04-08 16:07:30 +02:00
Laurent Destailleur
a74fc347bb Fix translation 2016-04-08 15:41:01 +02:00
Laurent Destailleur
1b04eabf1f Merge log with events tabs 2016-04-08 14:28:49 +02:00
Laurent Destailleur
ee53a8b1a8 NEW Can filter modules on publisher 2016-04-06 16:45:22 +02:00
frederic34
e53501f89d add lang 2016-04-04 18:37:04 +02:00
Juanjo Menent
d55d12baeb NEW #3510 : Working 2016-04-03 11:56:31 +02:00
aspangaro
05df3408f2 Debug works 2016-03-25 15:59:38 +01:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
aspangaro
1712ad04cc Debug works 2016-03-23 22:23:59 +01:00
jtisseau
969893a5b1 Adds multilanguage translations for MAIN_MAIL_EMAIL_STARTTLS 
Adds the translations for all languages having the MAIN_MAIL_EMAIL_TLS
const defined. It's just a copy of this last one changing the "(SSL)" by
"(STARTTLS)".
 2016-03-16 02:23:06 +01:00
Laurent Destailleur
09a29322c3 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/supplier/list.php
	htdocs/commande/orderstoinvoice.php
	htdocs/public/demo/index.php
	htdocs/societe/commerciaux.php
 2016-03-08 17:40:21 +01:00
Laurent Destailleur
446a080c75 NEW Mutualize code to manage email substitution variables. Show 
available variables into page to edit email templates.
 2016-03-05 12:20:58 +01:00
Laurent Destailleur
f06911a8b0 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/societe/commerciaux.php
 2016-03-04 15:39:55 +01:00
philippe grand
6851c3fdb0 fix : missing translation 2016-03-03 16:18:07 +01:00
philippe grand
74601a0b1d fix : missing translation 2016-03-03 16:01:50 +01:00
philippe grand
ba2c0db159 fix : missing translation 2016-03-03 12:00:08 +01:00
philippe grand
9f798bc3fc fix : missing translation 2016-03-03 11:54:12 +01:00
philippe grand
59c4559a78 fix : missing translation 2016-03-02 21:13:12 +01:00
Laurent Destailleur
da284cda8c Add category Supplier Relationship Manager 2016-02-19 19:20:21 +01:00
Laurent Destailleur
9c8d69eaa9 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
 2016-02-19 04:46:11 +01:00
Laurent Destailleur
16c44af690 Fix bad example of setup to use 2016-02-19 02:44:56 +01:00
Laurent Destailleur
fad09357f4 NEW Show total number of modules into the module list 2016-02-16 12:54:42 +01:00
Laurent Destailleur
0b6bd0bc14 More robust error management on barcode module. 2016-02-08 15:49:38 +01:00
phf
75c4888364 NEW feature hidden extrafields 2016-02-03 22:49:43 +01:00
Laurent Destailleur
19d119d3a4 Debug cron module. 
Task to delete temporary files older than 24 is on by default.
 2016-01-30 02:51:26 +01:00
Laurent Destailleur
8e882b4cc2 NEW Add warning on tasks when they are late (add also the warning 
tolerance parameter)
 2016-01-18 15:56:51 +01:00
Laurent Destailleur
4a009d2ad2 NEW On translation admin page, admin can overwrite a translation value. 2016-01-16 00:48:14 +01:00
Laurent Destailleur
e79750dc89 I continue bug war week-end 2016-01-09 00:44:06 +01:00
Laurent Destailleur
c9176cd6b4 Missing translation 2016-01-08 18:22:41 +01:00
Laurent Destailleur
52cd5d505e Fix several bugs on css, translation or look 2016-01-01 23:44:23 +01:00
Laurent Destailleur
3680202c1c Fix do not share color for title of table and title of pages 2015-12-13 14:39:12 +01:00
Laurent Destailleur
9c227d154e Clean duplicate translation key 2015-12-06 13:37:48 +01:00
Laurent Destailleur
7f3531a04c Enhance script to track duplicate translation string and use it to 
remove around 50 duplicates.
 2015-12-06 13:34:57 +01:00
aspangaro
d12e3ca91f Finish work on better integration of skype 2015-11-28 14:43:16 +01:00
aspangaro
3457a732f5 New: Better integration of skype 2015-11-25 20:19:18 +01:00
Laurent Destailleur
ffeae34f51 Update doc 2015-11-22 18:41:35 +01:00
Laurent Destailleur
73bcc3bfe3 The temp dir for cache used by rester is correctly managed: No temp or 
data files must be stored outside of documents directory.
 2015-11-22 17:39:13 +01:00
philippe grand
210c6c67cd better translation and missing translation 2015-11-22 10:40:04 +01:00
Laurent Destailleur
e3c6e4ebe5 NEW Add planned workload and declared progress on project summary list 
on project home page (data aggregated from tasks of project)
 2015-11-21 20:00:38 +01:00
Florian HENRY
b8cab9f4d9 continue extrafeild $ID$ and SELECT feature 2015-11-20 13:51:57 +01:00
Florian HENRY
1566be35a1 NEW : add $ID$ into extrafields management to allow use current object 
id on filter for select list from table and checkbox list from table
 2015-11-20 11:59:28 +01:00
Laurent Destailleur
6bd6be0912 Debug and rename experimental module "supplier proposal". Still work to 
do: Must fix the PDF to be compliant with a request quotation to a
supplier (so no need to show vat, unit price, ...).
 2015-11-15 19:23:39 +01:00
Laurent Destailleur
db941d5395 NEW Enhance style engine. Add option to set color of links 2015-11-15 11:31:09 +01:00
Alexis Algoud
8221817087 NEW add an option to use standard ISO location for bill in crabe model 
For electronic sending solutions, it could be required
 2015-11-05 16:17:09 +01:00
philippe grand
b9c0cd316f [Qual] Fix : TODO:translate 2015-11-05 11:11:51 +01:00
Laurent Destailleur
1f4481a6b0 Merge pull request #3172 from atm-maxime/new_creditnote 
NEW Add hidden option INVOICE_CREDIT_NOTE_STANDALONE to allow to create credit note without invoice
 2015-11-05 02:45:15 +01:00
Laurent Destailleur
da0aa2f937 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
	htdocs/langs/en_US/main.lang
	htdocs/product/list.php
	htdocs/product/stock/mouvement.php
 2015-11-02 19:31:42 +01:00
Laurent Destailleur
a161e6d47a Continue debug of PRODUIT_MULTIPRICES option. 
Introduce option PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL to have
relative caculation of multiprice not yet visible.
 2015-11-02 10:09:09 +01:00
aspangaro
4e9d06785c Fix #3818 & presentation 2015-10-29 06:47:42 +01:00
aspangaro
e2ba24826f Review 3.8 2015-10-29 06:06:56 +01:00
philippe grand
d517595f82 [Qual] Uniformize code 2015-10-28 19:28:18 +01:00
Juanjo Menent
a36559c55c Merge pull request #3809 from aspangaro/develop-hrm 
HRM module : continue to work
 2015-10-28 16:11:17 +01:00
Laurent Destailleur
fb28586f32 Better visible of what is possible for stock management 2015-10-27 19:18:22 +01:00
aspangaro
93d340e497 HRM module : continue to work 2015-10-27 07:26:57 +01:00
Laurent Destailleur
6493438e87 NEW The clicktodial module is now able to provide link "tel:" on phone 
numbers. So it is also possible to use clicktodial with a client
solution like the "xivo" local client.
 2015-10-26 16:20:09 +01:00
Laurent Destailleur
d5e42478a9 Removed deprecated options to show or not forms. Such forms does not 
exists anymore.
 2015-10-26 12:37:36 +01:00
Maxime Kohlhaas
bd831b1f24 Merge branch 'new_creditnote' of github.com:atm-maxime/dolibarr into new_creditnote 2015-10-26 09:40:50 +01:00
Laurent Destailleur
8df59134a9 Merge pull request #3705 from aspangaro/develop-hrm 
New : Module HRM
 2015-10-22 19:15:49 +02:00
frederic34
865e9d9738 Merge remote branch 'upstream/develop' into patch-15 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2015-10-22 10:28:06 +02:00
Laurent Destailleur
9a1ec900bd NEW Add into about page, a sample text to use to promote new version 
release (visible only if version is last stable)
 2015-10-21 00:31:32 +02:00
Laurent Destailleur
0c6441df74 FIX Using extrafield with type "Link to object" works correctly. 2015-10-20 12:40:37 +02:00
Frédéric FRANCE
3e730cc9e2 Update admin.lang 2015-10-19 22:01:30 +02:00
Laurent Destailleur
b9001d7ab8 NEW Prepare database to store information per files (for example to 
define if an image ca, be used as a cover or not)
 2015-10-18 22:43:19 +02:00
aspangaro
8e37da55c3 Add searchform, language key and correct code 2015-10-10 08:34:15 +02:00
Laurent Destailleur
8db83a51b2 Missing translation 2015-10-07 14:30:54 +02:00
Laurent Destailleur
4b103ba8ce Work on a better way to manage modules. All one page. Introduce a way to 
choose order of modules family. We should also be able to introduce
filters.
 2015-10-07 08:13:23 +02:00
Laurent Destailleur
8d47a307bb Better use of space 2015-10-06 21:52:42 +02:00
Juanjo Menent
92f4c0d015 Merge remote-tracking branch 'upstream/develop' into dolibarr-3509 2015-10-03 16:01:24 +02:00
Juanjo Menent
67d28d6991 Merge remote-tracking branch 'upstream/develop' into dolibarr-3509 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-10-03 14:59:56 +02:00
Laurent Destailleur
c0c0cc2415 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/interventions.lang
	htdocs/theme/md_exp/style.css.php
 2015-10-03 14:28:31 +02:00
Laurent Destailleur
b57c156b60 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/modules/modContrat.class.php
	htdocs/fichinter/card.php
	htdocs/install/upgrade2.php
 2015-10-01 11:16:35 +02:00
Laurent Destailleur
9c4a12b9d4 Merge pull request #3613 from aspangaro/develop-68 
Fix : remove viewport for mobile device already declared
 2015-10-01 10:29:39 +02:00
Laurent Destailleur
1108656d19 NEW Can set color of the highlight hover line 2015-09-29 15:58:24 +02:00
Laurent Destailleur
60c6510fc1 NEW Can set default value of event type when creating an event (if type 
of event option is used).
 2015-09-29 14:17:03 +02:00
aspangaro
0b266a8ee5 Fix : remove viewport for mobile device already declared 2015-09-27 14:15:09 +02:00
philippe
1454d942ef missing translation 2015-09-27 11:06:45 +02:00
Juanjo Menent
4fa1be0e35 Issue #3509: Init works 2015-09-26 10:37:36 +02:00
Laurent Destailleur
ee683049a6 Enhance CSS capabilities 2015-09-22 11:24:31 +02:00
Laurent Destailleur
309e1604e1 Fix migration missing for leave request module 
Fix permission label for expense report and leave request
 2015-09-12 11:35:49 +02:00
Laurent Destailleur
4b97fae28f Fix migration missing for leave request module 
Fix permission label for expense report and leave request
 2015-09-11 07:52:06 +02:00
Laurent Destailleur
91ddca6ab0 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/core/tpl/objectline_edit.tpl.php
 2015-09-06 16:34:40 +02:00
Laurent Destailleur
d108881690 Merge pull request #3370 from atm-gauthier/new_add_next_ref_on_product_service_clone 
NEW : conf to use next product/service ref when we clone a product/se…
 2015-09-05 10:57:11 +02:00
Laurent Destailleur
304a71710e Fix not complete info 2015-09-05 00:57:11 +02:00
Raphaël Doursenaud
7bb917e637 NEW Support logging to a Sentry server 
Sentry is an Open Source error logging and aggregation platform.
It can be used on-premise or hosted at https://getsentry.com
 2015-09-04 19:10:13 +02:00
Laurent Destailleur
441bb83e64 Fix url of local web sites 2015-09-01 10:08:03 +02:00
Laurent Destailleur
ffeaa4e224 Test update checksum file 2015-07-29 15:50:59 +02:00
Laurent Destailleur
747e4b5e40 Fix timezone problem with external calendar import. 2015-07-28 18:12:45 +02:00
Gauthier
900c287de4 NEW : conf to use next product/service ref when we clone a product/service 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/product/admin/product.php
 2015-07-21 12:43:12 +02:00
Laurent Destailleur
a5ffcb50ae Update admin.lang 
More complete description of module poll.
 2015-07-19 00:32:57 +02:00
Laurent Destailleur
a66985a279 Restore backup feature 2015-07-16 00:58:05 +02:00
Laurent Destailleur
e31af7f914 Can filter list of setup constant on name and extend visibility to all. 2015-07-12 18:05:56 +02:00
Laurent Destailleur
8690b5e70e FIX #3173 Overlapping of shipment ref 2015-07-12 16:22:06 +02:00
Maxime Kohlhaas
9f9ba12802 New : option to allow credit note without related invoice 2015-07-08 14:32:57 +02:00
Laurent Destailleur
9c80735310 An easier to use dictionary page to edit email template. 
Uniformize look.
 2015-07-04 03:28:52 +02:00
Laurent Destailleur
0ac43211ad NEW: Add help tooltips on fields of dictionary edit pages. 
Fix: visible list of tasks are for opened project only.
 2015-07-04 02:08:06 +02:00
Laurent Destailleur
ae5b779652 Uniformize code 2015-06-30 01:34:17 +02:00
Laurent Destailleur
0fe0c989ca Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-26 17:36:54 +02:00
Laurent Destailleur
8f691138e8 NEW Can edit Background color for Top menu and Background color for 
table title line (works only with theme menu eldy).
 2015-06-26 16:21:09 +02:00
Laurent Destailleur
fcc9fc6672 Fix translation 2015-06-24 16:54:44 +02:00
Laurent Destailleur
040a643ee9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/expensereport/card.php
	htdocs/projet/element.php
 2015-06-23 18:34:39 +02:00
Laurent Destailleur
27cc7ef2b3 Time spent 2015-06-23 10:13:08 +02:00
Laurent Destailleur
4f1538f502 Introduce table llx_c_holiday_type 2015-06-21 03:19:15 +02:00
Laurent Destailleur
2c5ef858d0 NEW Filter "active" by default on user list. 
Fix label of permission of project module
 2015-06-20 20:35:57 +02:00
Laurent Destailleur
9281e2a824 Merge pull request #3049 from marcosgdf/task-1191 
NEW [ task 1191 ] AJAX selector for projects
 2015-06-16 11:09:34 +02:00
Laurent Destailleur
609eb26151 Merge pull request #3051 from aternatik/api 
Changes into API
 2015-06-16 11:08:14 +02:00
jfefe
190ee35e86 Merge branch 'develop' into api_rest 
Conflicts:
	htdocs/user/card.php
	htdocs/user/class/user.class.php
 2015-06-15 14:29:34 +02:00
jfefe
00125d1060 Add option to set production mode to API 2015-06-15 14:11:43 +02:00
Marcos García de La Fuente
65d3f7968a NEW [ task 1191 ] AJAX selector for projects 2015-06-15 10:04:36 +02:00
Raphaël Doursenaud
7808c5a5ad Add missing ; to database password encryption instructions 
Fix #2969
 2015-06-05 17:14:53 +02:00
Laurent Destailleur
30f6cd08cf Merge pull request #2943 from aspangaro/develop-donation2 
New: Add object ot the company & Add picture cerfa logo
 2015-06-05 15:58:47 +02:00
Laurent Destailleur
1f92f542a6 NEW Hidden option THEME_ELDY_USE_HOVER is stable enough to become 
officialy visible into setup.
 2015-06-04 13:32:21 +02:00
Laurent Destailleur
331ebbdd73 Fix behaviour on grey/visible menu must be same everywhere on 
application.
 2015-06-04 11:42:24 +02:00
aspangaro
3461a8712a New: Add object of the company - Needed for donation 2015-06-03 06:48:15 +02:00
Laurent Destailleur
0b372a4017 Use a dedicated icon instead of generic one 2015-05-30 17:32:50 +02:00
jfefe
a618274760 Allow modify API key from user card 2015-05-29 16:05:52 +02:00
Laurent Destailleur
6108dfad55 Minor enhancement 2015-05-22 00:46:53 +02:00
Laurent Destailleur
58b70f0503 Better translation 2015-05-16 03:07:29 +02:00
Laurent Destailleur
43b5209192 NEW Clean code into salary module, debug and add indexes 
NEW Can filter on user list and salary payments on user with naural
search.
 2015-05-13 08:57:39 +02:00
Laurent Destailleur
cb6f23d9b6 Merge pull request #2771 from aternatik/api_rest 
Add new core module : REST API
 2015-05-12 19:39:37 +02:00
Laurent Destailleur
3a8cf17f3c NEW Can edit list of prospect status for customers/prospects. Add a new 
entry into dictionary table to manage list fo status.
Removed deprecated files.
 2015-05-06 23:13:07 +02:00
jfefe
53f480708f Merge branch 'develop' into api_restler 2015-05-03 23:43:13 +02:00
Francis Appels
f9908c48cb Add datamatrix en qrcode barcodes 2015-05-03 10:07:04 +02:00
jfefe
4ccb04590e Add API admin page 2015-05-02 15:27:19 +02:00
Laurent Destailleur
53bf90a3e2 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2015-04-28 21:54:13 +02:00
Laurent Destailleur
aa9bffe5c9 Fix translation 2015-04-27 02:34:15 +02:00
Laurent Destailleur
414404e854 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/core/class/commonobject.class.php
 2015-04-26 16:30:33 +02:00
Laurent Destailleur
7b9d9c4d0a Fix lang 2015-04-26 16:25:02 +02:00
Marcos García de La Fuente
87f97ed545 Merge branch 'develop' into units 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/admin/product.php
	htdocs/product/card.php
 2015-04-18 23:38:14 +02:00
Laurent Destailleur
b3fc8d2940 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 
Conflicts:
	htdocs/langs/en_US/products.lang
 2015-04-18 20:27:50 +02:00
Florian HENRY
e15d4c045d NEW : Propal merge product card PDF into azur 2015-04-18 18:44:05 +02:00
faust
b7fb3d7d9e en_US: 'opened' is not an adjective... 2015-04-18 16:39:57 +02:00
Laurent Destailleur
ae103e34b8 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/debian/changelog
	htdocs/compta/facture.php
	htdocs/core/lib/price.lib.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/opensurvey/public/studs.php
	htdocs/projet/element.php
 2015-04-13 13:08:46 +02:00
Laurent Destailleur
56a14da5d4 FIXME that are not bug are replaced with TODO 
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
 2015-04-12 04:01:28 +02:00
Laurent Destailleur
74a4bca42c Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-04-11 22:52:27 +02:00
Laurent Destailleur
6889162d7a Fix: management of vat type 2, 4 and 6 is now ok. 
Works for canada and ivory cost.
 2015-04-11 22:51:53 +02:00
frederic34
19b55cb4c1 Add public note to members 2015-04-06 18:58:36 +02:00
Laurent Destailleur
2ec5595277 NEW Can install an external module from admin pages, if web server has 
permission for and if setup is ok for.
 2015-04-04 00:19:03 +02:00
Laurent Destailleur
e6c9e07de4 NEW Backup and restore tool is easier to use 2015-04-03 17:17:02 +02:00
Marcos García de La Fuente
7075ac74c4 Merge branch 'develop' into units 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/class/product.class.php
 2015-04-03 15:45:54 +02:00
Laurent Destailleur
50d77d7e6f Correct source lang 2015-04-02 12:55:44 +02:00
Laurent Destailleur
d8db32a99c NEW: Introduce option SUPPLIER_ORDER_DOUBLE_APPROVAL to allow 2 
approvals to make a supplier order approved. Activating this option
introduce a new permission to the second level approval.
 2015-04-01 21:00:51 +02:00
Laurent Destailleur
8e9c1c4747 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/list.php
	htdocs/core/class/notify.class.php
	htdocs/core/login/functions_dolibarr.php
	htdocs/exports/export.php
	htdocs/langs/en_US/admin.lang
 2015-04-01 16:33:39 +02:00
Laurent Destailleur
b83e9ea32f Merge branch 'loan' of https://github.com/frederic34/dolibarr into 
frederic34-loan

Conflicts:
	htdocs/compta/bank/ligne.php
 2015-03-30 02:56:26 +02:00
Laurent Destailleur
018a0d779f Fix translation 2015-03-29 15:18:10 +02:00
Laurent Destailleur
ab739e162c Merge remote-tracking branch 'origin/3.7' into develop 2015-03-25 18:11:29 +01:00
Laurent Destailleur
f75c115140 Fix translation 
Fix permission not managed into get_menudiv.php
 2015-03-24 11:19:51 +01:00
aspangaro
414d4c6432 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-03-22 18:08:12 +01:00
Laurent Destailleur
f44d91e153 NEW: The notification module accept keyword __SUPERVISOR__ to send 
notification to supervisor of user.
 2015-03-19 11:47:30 +01:00
Laurent Destailleur
6ceda02eaa NEW: Enhancement of module 'Notification by Email'. Show nb of 
notifications set. Can set several emails. Can set a threshold on
amount for notifications. Add notification on supplier order validation.
 2015-03-18 21:44:57 +01:00
aspangaro
3897e65425 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-03-11 05:28:59 +01:00
Laurent Destailleur
84695845bb Some fixes into translation and permissions 2015-03-09 21:20:56 +01:00
aspangaro
11704e0807 Merge remote-tracking branch 'Upstream/develop' into develop-loan 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-05 20:24:53 +01:00
Laurent Destailleur
96de912661 NEW: Add module "Supplier commercial proposals" to requests 
quotation/price to suppliers.
Merge branch 'new_ask_price' of https://github.com/atm-ph/dolibarr into
atm-ph-new_ask_price

Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/tpl/document_actions_post_headers.tpl.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-04 17:54:43 +01:00
aspangaro
c119ce382e Merge remote-tracking branch 'Upstream/develop' into develop-loan 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-02 21:05:38 +01:00
Laurent Destailleur
2795d27cc9 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/admin.lang
	htdocs/projet/index.php
 2015-03-01 16:13:22 +01:00
Marcos García de La Fuente
b4c84fac9d NEW: [ task #977 ] New option to manage product unit 
Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
 2015-03-01 12:42:38 +01:00
Laurent Destailleur
f8e9a38e5c Fix: Avoid empty table into setup when module are missing. 2015-02-28 19:37:44 +01:00
Laurent Destailleur
a87c867c28 Translation 2015-02-26 16:02:03 +01:00
aspangaro
4803a1fb89 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-02-25 06:59:27 +01:00
Laurent Destailleur
472181a03b Merge pull request #2374 from frederic34/filecheck 
Files Integrity Checker
 2015-02-24 10:08:39 +01:00
Laurent Destailleur
2bc6ac4671 Finished new module to manage expense reports ! 
Fix export to support corectly multicompany
 2015-02-22 13:16:49 +01:00
aspangaro
63099727d0 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-02-21 15:10:35 +01:00
frederic34
2b19f75460 Files Integrity Checker 2015-02-19 21:26:03 +01:00
Laurent Destailleur
e3713c8b6d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/tools/eaccelerator.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
 2015-02-19 00:01:26 +01:00
Laurent Destailleur
c2f5b24a9d Better text 2015-02-18 22:40:13 +01:00
Laurent Destailleur
06c90e67bb Merge pull request #2339 from KreizIT/fix_1829 
FIXED: #1829 POS not compatible with batch products
 2015-02-18 22:38:19 +01:00
Laurent Destailleur
b6947dbe2c Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/modules/DolibarrModules.class.php
 2015-02-18 22:04:26 +01:00
Laurent Destailleur
cc1d506614 Miscelaneous debug on barcode features. 2015-02-18 21:01:17 +01:00
Laurent Destailleur
685b8d722d Fix: Bad hook name 2015-02-17 16:46:37 +01:00
Laurent Destailleur
448655ea45 First work on a new module for expense report matching dolibarr 
standard to replace current one.
 2015-02-14 18:39:45 +01:00
Laurent Destailleur
e3885d6d73 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/lib/tax.lib.php
 2015-02-10 21:36:38 +01:00
Laurent Destailleur
ddb95e5765 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/comm/mailing/fiche.php
	htdocs/compta/paiement/liste.php
	htdocs/contact/class/contact.class.php
	htdocs/core/lib/tax.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/langs/en_US/agenda.lang
	htdocs/webservices/server_contact.php
 2015-02-10 21:33:43 +01:00
KreizIT
2483d96b33 FIXED: #1829 POS not compatible with batch products 2015-02-09 17:19:20 +01:00
phf
34bc1dbc15 Merge branch 'develop' into new_ask_price 2015-02-09 09:07:50 +01:00
Laurent Destailleur
64963ef9bd Fix: the syslog handler for chromphp an fiefoxphp was not visible when 
they should not.
 2015-02-07 19:12:22 +01:00
phf
bcbf29d9a5 [CORE] assainissement du code + traductions FR vers EN (#new_ask_price). 2015-02-04 15:39:57 +01:00
Laurent Destailleur
21c78cc392 Merge remote-tracking branch 'origin/3.7' into develop 2015-02-02 21:45:31 +01:00
Laurent Destailleur
6b27d8d44c Merge pull request #2298 from ndrosis/patch-16 
Correct view link
 2015-01-31 20:25:11 +01:00
Laurent Destailleur
324ded162d Merge pull request #2297 from ndrosis/patch-15 
translate UpdateServerOffline live last version
 2015-01-31 20:20:18 +01:00
Laurent Destailleur
770ddb6b0f Merge branch 'task-1793' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-task-1793

Conflicts:
	ChangeLog
	htdocs/margin/lib/margins.lib.php
 2015-01-31 14:29:15 +01:00
Laurent Destailleur
4fdc287717 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/admin/menus.php
	htdocs/fourn/commande/card.php
	htdocs/install/check.php
 2015-01-30 15:53:06 +01:00
Drosis Nikos
f86db9d686 Correct view link 2015-01-28 23:55:12 +02:00
Drosis Nikos
831bc5393d translate UpdateServerOffline live last version 2015-01-28 23:17:46 +02:00
Laurent Destailleur
14be79d3e8 Better help 
Bad var
 2015-01-28 20:04:18 +01:00
Laurent Destailleur
57c84089fe Introduce warning to remind to do a backup before migration. 
Required because we discovered, during beta, serious bugs into some
databases system loosing data.
 2015-01-25 22:29:36 +01:00
Laurent Destailleur
568d5cb5ba Fixed: Tracking number restored on PDF shipments 
Fixed: Translation

Conflicts:
	htdocs/langs/en_US/agenda.lang
 2015-01-23 18:47:47 +01:00
Laurent Destailleur
083cf06908 Fixed: Tracking number restored on PDF shipments 
Fixed: Translation
 2015-01-23 18:33:33 +01:00
Laurent Destailleur
017a483eb3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-01-21 00:06:03 +01:00
Laurent Destailleur
449f2b9346 Merge branch 'delay-emailing' of https://github.com/marcosgdf/dolibarr 
into marcosgdf-delay-emailing

Conflicts:
	htdocs/comm/mailing/card.php
 2015-01-21 00:05:19 +01:00